BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

15 files changed, 66 insertions, 40 deletions

diff --git a/chromium/media/learning/common/feature_dictionary.h b/chromium/media/learning/common/feature_dictionary.h
index ac09739d6a6..9b5b9fb099a 100644
--- a/chromium/media/learning/common/feature_dictionary.h
+++ b/chromium/media/learning/common/feature_dictionary.h
@@ -30,6 +30,10 @@ class COMPONENT_EXPORT(LEARNING_COMMON) FeatureDictionary {
   using Dictionary = std::map<std::string, FeatureValue>;
 
   FeatureDictionary();
+
+  FeatureDictionary(const FeatureDictionary&) = delete;
+  FeatureDictionary& operator=(const FeatureDictionary&) = delete;
+
   ~FeatureDictionary();
 
   // Add features for |task| to |features| from our dictionary.  Features that
@@ -42,8 +46,6 @@ class COMPONENT_EXPORT(LEARNING_COMMON) FeatureDictionary {
 
  private:
   Dictionary dictionary_;
-
-  DISALLOW_COPY_AND_ASSIGN(FeatureDictionary);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/common/learning_session.h b/chromium/media/learning/common/learning_session.h
index 6468871eab4..568c3bc3f89 100644
--- a/chromium/media/learning/common/learning_session.h
+++ b/chromium/media/learning/common/learning_session.h
@@ -24,14 +24,15 @@ class COMPONENT_EXPORT(LEARNING_COMMON) LearningSession
     : public base::SupportsUserData::Data {
  public:
   LearningSession();
+
+  LearningSession(const LearningSession&) = delete;
+  LearningSession& operator=(const LearningSession&) = delete;
+
   ~LearningSession() override;
 
   // Return a LearningTaskController for the given task.
   virtual std::unique_ptr<LearningTaskController> GetController(
       const std::string& task_name) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LearningSession);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/common/learning_task_controller.h b/chromium/media/learning/common/learning_task_controller.h
index 0644e2d85f8..21dacfd9df9 100644
--- a/chromium/media/learning/common/learning_task_controller.h
+++ b/chromium/media/learning/common/learning_task_controller.h
@@ -49,6 +49,10 @@ class COMPONENT_EXPORT(LEARNING_COMMON) LearningTaskController {
       const absl::optional<TargetHistogram>& predicted)>;
 
   LearningTaskController() = default;
+
+  LearningTaskController(const LearningTaskController&) = delete;
+  LearningTaskController& operator=(const LearningTaskController&) = delete;
+
   virtual ~LearningTaskController() = default;
 
   // Start a new observation.  Call this at the time one would try to predict
@@ -95,9 +99,6 @@ class COMPONENT_EXPORT(LEARNING_COMMON) LearningTaskController {
   // may be called immediately without posting.
   virtual void PredictDistribution(const FeatureVector& features,
                                    PredictionCB callback) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LearningTaskController);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/distribution_reporter.h b/chromium/media/learning/impl/distribution_reporter.h
index 6a96cf7aac4..1799129ebc0 100644
--- a/chromium/media/learning/impl/distribution_reporter.h
+++ b/chromium/media/learning/impl/distribution_reporter.h
@@ -55,6 +55,9 @@ class COMPONENT_EXPORT(LEARNING_IMPL) DistributionReporter {
   // Create a DistributionReporter that's suitable for |task|.
   static std::unique_ptr<DistributionReporter> Create(const LearningTask& task);
 
+  DistributionReporter(const DistributionReporter&) = delete;
+  DistributionReporter& operator=(const DistributionReporter&) = delete;
+
   virtual ~DistributionReporter();
 
   // Returns a prediction CB that will be compared to |prediction_info.observed|
@@ -93,8 +96,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) DistributionReporter {
   absl::optional<std::set<int>> feature_indices_;
 
   base::WeakPtrFactory<DistributionReporter> weak_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(DistributionReporter);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/extra_trees_trainer.cc b/chromium/media/learning/impl/extra_trees_trainer.cc
index 572c0f1f56f..03cb8e6e814 100644
--- a/chromium/media/learning/impl/extra_trees_trainer.cc
+++ b/chromium/media/learning/impl/extra_trees_trainer.cc
@@ -57,15 +57,15 @@ void ExtraTreesTrainer::OnRandomTreeModel(TrainedModelCB model_cb,
 
   // If this is the last tree, then return the finished model.
   if (trees_.size() == task_.rf_number_of_trees) {
-    std::unique_ptr<Model> model =
+    std::unique_ptr<Model> finished_model =
         std::make_unique<VotingEnsemble>(std::move(trees_));
     // If we have a converter, then wrap everything in a ConvertingModel.
     if (converter_) {
-      model = std::make_unique<ConvertingModel>(std::move(converter_),
-                                                std::move(model));
+      finished_model = std::make_unique<ConvertingModel>(
+          std::move(converter_), std::move(finished_model));
     }
 
-    std::move(model_cb).Run(std::move(model));
+    std::move(model_cb).Run(std::move(finished_model));
     return;
   }
 
diff --git a/chromium/media/learning/impl/extra_trees_trainer.h b/chromium/media/learning/impl/extra_trees_trainer.h
index 45784f2e3f5..0509a540063 100644
--- a/chromium/media/learning/impl/extra_trees_trainer.h
+++ b/chromium/media/learning/impl/extra_trees_trainer.h
@@ -34,6 +34,10 @@ class COMPONENT_EXPORT(LEARNING_IMPL) ExtraTreesTrainer
       public base::SupportsWeakPtr<ExtraTreesTrainer> {
  public:
   ExtraTreesTrainer();
+
+  ExtraTreesTrainer(const ExtraTreesTrainer&) = delete;
+  ExtraTreesTrainer& operator=(const ExtraTreesTrainer&) = delete;
+
   ~ExtraTreesTrainer() override;
 
   // TrainingAlgorithm
@@ -51,8 +55,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) ExtraTreesTrainer
   std::vector<std::unique_ptr<Model>> trees_;
   std::unique_ptr<OneHotConverter> converter_;
   TrainingData converted_training_data_;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtraTreesTrainer);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/feature_provider.h b/chromium/media/learning/impl/feature_provider.h
index c53fb81374a..b384c8c40f7 100644
--- a/chromium/media/learning/impl/feature_provider.h
+++ b/chromium/media/learning/impl/feature_provider.h
@@ -25,14 +25,15 @@ class COMPONENT_EXPORT(LEARNING_IMPL) FeatureProvider {
   using FeatureVectorCB = base::OnceCallback<void(FeatureVector)>;
 
   FeatureProvider();
+
+  FeatureProvider(const FeatureProvider&) = delete;
+  FeatureProvider& operator=(const FeatureProvider&) = delete;
+
   virtual ~FeatureProvider();
 
   // Update |features| to include whatever features are specified by |task_|,
   // and call |cb| once they're filled in.
   virtual void AddFeatures(FeatureVector features, FeatureVectorCB cb) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FeatureProvider);
 };
 
 // Since FeatureProviders are often going to thread-hop, provide this typedef.
diff --git a/chromium/media/learning/impl/lookup_table_trainer.h b/chromium/media/learning/impl/lookup_table_trainer.h
index f17e6173b2a..08486f6aab3 100644
--- a/chromium/media/learning/impl/lookup_table_trainer.h
+++ b/chromium/media/learning/impl/lookup_table_trainer.h
@@ -18,14 +18,15 @@ class COMPONENT_EXPORT(LEARNING_IMPL) LookupTableTrainer
     : public TrainingAlgorithm {
  public:
   LookupTableTrainer();
+
+  LookupTableTrainer(const LookupTableTrainer&) = delete;
+  LookupTableTrainer& operator=(const LookupTableTrainer&) = delete;
+
   ~LookupTableTrainer() override;
 
   void Train(const LearningTask& task,
              const TrainingData& training_data,
              TrainedModelCB model_cb) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LookupTableTrainer);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/one_hot.h b/chromium/media/learning/impl/one_hot.h
index 23e69845c38..e249ddeb8d3 100644
--- a/chromium/media/learning/impl/one_hot.h
+++ b/chromium/media/learning/impl/one_hot.h
@@ -27,6 +27,10 @@ class COMPONENT_EXPORT(LEARNING_IMPL) OneHotConverter {
   // Build a one-hot converter for all nominal features |task|, using the values
   // found in |training_data|.
   OneHotConverter(const LearningTask& task, const TrainingData& training_data);
+
+  OneHotConverter(const OneHotConverter&) = delete;
+  OneHotConverter& operator=(const OneHotConverter&) = delete;
+
   ~OneHotConverter();
 
   // Return the LearningTask that has only nominal features.
@@ -54,8 +58,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) OneHotConverter {
   // [original task feature index] = optional converter for it.  If the feature
   // was kNumeric to begin with, then there will be no converter.
   std::vector<absl::optional<ValueVectorIndexMap>> converters_;
-
-  DISALLOW_COPY_AND_ASSIGN(OneHotConverter);
 };
 
 // Model that uses |Converter| to convert instances before sending them to the
@@ -64,6 +66,10 @@ class COMPONENT_EXPORT(LEARNING_IMPL) ConvertingModel : public Model {
  public:
   ConvertingModel(std::unique_ptr<OneHotConverter> converter,
                   std::unique_ptr<Model> model);
+
+  ConvertingModel(const ConvertingModel&) = delete;
+  ConvertingModel& operator=(const ConvertingModel&) = delete;
+
   ~ConvertingModel() override;
 
   // Model
@@ -72,8 +78,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) ConvertingModel : public Model {
  private:
   std::unique_ptr<OneHotConverter> converter_;
   std::unique_ptr<Model> model_;
-
-  DISALLOW_COPY_AND_ASSIGN(ConvertingModel);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/random_number_generator.h b/chromium/media/learning/impl/random_number_generator.h
index aeb4514b18e..0974a47a353 100644
--- a/chromium/media/learning/impl/random_number_generator.h
+++ b/chromium/media/learning/impl/random_number_generator.h
@@ -17,6 +17,10 @@ namespace media {
 class COMPONENT_EXPORT(LEARNING_IMPL) RandomNumberGenerator {
  public:
   RandomNumberGenerator() = default;
+
+  RandomNumberGenerator(const RandomNumberGenerator&) = delete;
+  RandomNumberGenerator& operator=(const RandomNumberGenerator&) = delete;
+
   virtual ~RandomNumberGenerator() = default;
 
   // Return a random generator that will return unpredictable values in the
@@ -35,9 +39,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) RandomNumberGenerator {
   // This isn't an overload of Generate() to be sure that one isn't surprised by
   // the result.
   double GenerateDouble(double range);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(RandomNumberGenerator);
 };
 
 // Handy mix-in class if you want to support rng injection.
diff --git a/chromium/media/learning/impl/random_tree_trainer.h b/chromium/media/learning/impl/random_tree_trainer.h
index 13d5bf12573..23fc7b31fa6 100644
--- a/chromium/media/learning/impl/random_tree_trainer.h
+++ b/chromium/media/learning/impl/random_tree_trainer.h
@@ -78,6 +78,10 @@ class COMPONENT_EXPORT(LEARNING_IMPL) RandomTreeTrainer
       public HasRandomNumberGenerator {
  public:
   explicit RandomTreeTrainer(RandomNumberGenerator* rng = nullptr);
+
+  RandomTreeTrainer(const RandomTreeTrainer&) = delete;
+  RandomTreeTrainer& operator=(const RandomTreeTrainer&) = delete;
+
   ~RandomTreeTrainer() override;
 
   // Train on all examples.  Calls |model_cb| with the trained model, which
@@ -174,8 +178,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) RandomTreeTrainer
   FeatureValue FindSplitPoint_Numeric(size_t index,
                                       const TrainingData& training_data,
                                       const std::vector<size_t>& training_idx);
-
-  DISALLOW_COPY_AND_ASSIGN(RandomTreeTrainer);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/training_algorithm.h b/chromium/media/learning/impl/training_algorithm.h
index a5fea2ca347..90c71f9bedd 100644
--- a/chromium/media/learning/impl/training_algorithm.h
+++ b/chromium/media/learning/impl/training_algorithm.h
@@ -21,14 +21,15 @@ using TrainedModelCB = base::OnceCallback<void(std::unique_ptr<Model>)>;
 class TrainingAlgorithm {
  public:
   TrainingAlgorithm() = default;
+
+  TrainingAlgorithm(const TrainingAlgorithm&) = delete;
+  TrainingAlgorithm& operator=(const TrainingAlgorithm&) = delete;
+
   virtual ~TrainingAlgorithm() = default;
 
   virtual void Train(const LearningTask& task,
                      const TrainingData& training_data,
                      TrainedModelCB model_cb) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TrainingAlgorithm);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/impl/voting_ensemble.h b/chromium/media/learning/impl/voting_ensemble.h
index 7e0cba7b59a..0994e58a1c0 100644
--- a/chromium/media/learning/impl/voting_ensemble.h
+++ b/chromium/media/learning/impl/voting_ensemble.h
@@ -20,6 +20,10 @@ namespace learning {
 class COMPONENT_EXPORT(LEARNING_IMPL) VotingEnsemble : public Model {
  public:
   VotingEnsemble(std::vector<std::unique_ptr<Model>> models);
+
+  VotingEnsemble(const VotingEnsemble&) = delete;
+  VotingEnsemble& operator=(const VotingEnsemble&) = delete;
+
   ~VotingEnsemble() override;
 
   // Model
@@ -27,8 +31,6 @@ class COMPONENT_EXPORT(LEARNING_IMPL) VotingEnsemble : public Model {
 
  private:
   std::vector<std::unique_ptr<Model>> models_;
-
-  DISALLOW_COPY_AND_ASSIGN(VotingEnsemble);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/mojo/mojo_learning_task_controller_service.h b/chromium/media/learning/mojo/mojo_learning_task_controller_service.h
index 9cdb8eae8ea..70f382a417e 100644
--- a/chromium/media/learning/mojo/mojo_learning_task_controller_service.h
+++ b/chromium/media/learning/mojo/mojo_learning_task_controller_service.h
@@ -28,6 +28,12 @@ class COMPONENT_EXPORT(MEDIA_LEARNING_MOJO) MojoLearningTaskControllerService
       const LearningTask& task,
       ukm::SourceId source_id,
       std::unique_ptr<::media::learning::LearningTaskController> impl);
+
+  MojoLearningTaskControllerService(const MojoLearningTaskControllerService&) =
+      delete;
+  MojoLearningTaskControllerService& operator=(
+      const MojoLearningTaskControllerService&) = delete;
+
   ~MojoLearningTaskControllerService() override;
 
   // mojom::LearningTaskController
@@ -53,8 +59,6 @@ class COMPONENT_EXPORT(MEDIA_LEARNING_MOJO) MojoLearningTaskControllerService
   std::unique_ptr<::media::learning::LearningTaskController> impl_;
 
   std::set<base::UnguessableToken> in_flight_observations_;
-
-  DISALLOW_COPY_AND_ASSIGN(MojoLearningTaskControllerService);
 };
 
 }  // namespace learning
diff --git a/chromium/media/learning/mojo/public/cpp/mojo_learning_task_controller.h b/chromium/media/learning/mojo/public/cpp/mojo_learning_task_controller.h
index f58305908a5..3ab18bf93a7 100644
--- a/chromium/media/learning/mojo/public/cpp/mojo_learning_task_controller.h
+++ b/chromium/media/learning/mojo/public/cpp/mojo_learning_task_controller.h
@@ -23,6 +23,11 @@ class COMPONENT_EXPORT(MEDIA_LEARNING_MOJO) MojoLearningTaskController
   MojoLearningTaskController(
       const LearningTask& task,
       mojo::Remote<mojom::LearningTaskController> controller);
+
+  MojoLearningTaskController(const MojoLearningTaskController&) = delete;
+  MojoLearningTaskController& operator=(const MojoLearningTaskController&) =
+      delete;
+
   ~MojoLearningTaskController() override;
 
   // LearningTaskController
@@ -44,8 +49,6 @@ class COMPONENT_EXPORT(MEDIA_LEARNING_MOJO) MojoLearningTaskController
  private:
   LearningTask task_;
   mojo::Remote<mojom::LearningTaskController> controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(MojoLearningTaskController);
 };
 
 }  // namespace learning