BASELINE: Update Chromium to 96.0.4664.181

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

7 files changed, 27 insertions, 19 deletions

diff --git a/chromium/components/background_task_scheduler/COMMON_METADATA b/chromium/components/background_task_scheduler/COMMON_METADATA
new file mode 100644
index 00000000000..dc57d9bc775
--- /dev/null
+++ b/chromium/components/background_task_scheduler/COMMON_METADATA
@@ -0,0 +1,7 @@
+monorail {
+  component: "Internals>BackgroundTaskScheduler"
+}
+
+team_email: "clank-dev@google.com"
+
+os: ANDROID
diff --git a/chromium/components/background_task_scheduler/DIR_METADATA b/chromium/components/background_task_scheduler/DIR_METADATA
index dc57d9bc775..1072541967b 100644
--- a/chromium/components/background_task_scheduler/DIR_METADATA
+++ b/chromium/components/background_task_scheduler/DIR_METADATA
@@ -1,7 +1,2 @@
-monorail {
-  component: "Internals>BackgroundTaskScheduler"
-}
+mixins: "//components/background_task_scheduler/COMMON_METADATA"
 
-team_email: "clank-dev@google.com"
-
-os: ANDROID
diff --git a/chromium/components/background_task_scheduler/background_task.h b/chromium/components/background_task_scheduler/background_task.h
index 1ecdd147dd6..0c94a32ea7e 100644
--- a/chromium/components/background_task_scheduler/background_task.h
+++ b/chromium/components/background_task_scheduler/background_task.h
@@ -60,14 +60,14 @@ class BackgroundTask {
   // task will not be rescheduled.
   virtual bool OnStopTask(const TaskParameters& task_params) = 0;
 
+  BackgroundTask(const BackgroundTask&) = delete;
+  BackgroundTask& operator=(const BackgroundTask&) = delete;
+
   // Destructor.
   virtual ~BackgroundTask() {}
 
  protected:
   BackgroundTask() = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BackgroundTask);
 };
 
 }  // namespace background_task
diff --git a/chromium/components/background_task_scheduler/background_task_scheduler.h b/chromium/components/background_task_scheduler/background_task_scheduler.h
index 535fe6fba18..776a8e9d0a4 100644
--- a/chromium/components/background_task_scheduler/background_task_scheduler.h
+++ b/chromium/components/background_task_scheduler/background_task_scheduler.h
@@ -18,6 +18,9 @@ namespace background_task {
 // BackgroundTaskScheduler.java.
 class BackgroundTaskScheduler : public KeyedService {
  public:
+  BackgroundTaskScheduler(const BackgroundTaskScheduler&) = delete;
+  BackgroundTaskScheduler& operator=(const BackgroundTaskScheduler&) = delete;
+
   // Schedules a background task with various scheduling related params
   // contained in |task_info|.
   virtual bool Schedule(const TaskInfo& task_info) = 0;
@@ -28,9 +31,6 @@ class BackgroundTaskScheduler : public KeyedService {
  protected:
   BackgroundTaskScheduler() = default;
   ~BackgroundTaskScheduler() override = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BackgroundTaskScheduler);
 };
 
 }  // namespace background_task
diff --git a/chromium/components/background_task_scheduler/background_task_scheduler_factory.h b/chromium/components/background_task_scheduler/background_task_scheduler_factory.h
index 19c3dfd82ca..c1444ddb947 100644
--- a/chromium/components/background_task_scheduler/background_task_scheduler_factory.h
+++ b/chromium/components/background_task_scheduler/background_task_scheduler_factory.h
@@ -29,6 +29,11 @@ class BackgroundTaskSchedulerFactory : public SimpleKeyedServiceFactory {
   // Returns the BackgroundTaskScheuler associated with |key|.
   static BackgroundTaskScheduler* GetForKey(SimpleFactoryKey* key);
 
+  BackgroundTaskSchedulerFactory(const BackgroundTaskSchedulerFactory&) =
+      delete;
+  BackgroundTaskSchedulerFactory& operator=(
+      const BackgroundTaskSchedulerFactory&) = delete;
+
  private:
   friend struct base::DefaultSingletonTraits<BackgroundTaskSchedulerFactory>;
 
@@ -39,8 +44,6 @@ class BackgroundTaskSchedulerFactory : public SimpleKeyedServiceFactory {
   std::unique_ptr<KeyedService> BuildServiceInstanceFor(
       SimpleFactoryKey* key) const override;
   SimpleFactoryKey* GetKeyToUse(SimpleFactoryKey* key) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(BackgroundTaskSchedulerFactory);
 };
 
 }  // namespace background_task
diff --git a/chromium/components/background_task_scheduler/internal/android/native_task_scheduler.h b/chromium/components/background_task_scheduler/internal/android/native_task_scheduler.h
index 7110db745f3..04e9f469932 100644
--- a/chromium/components/background_task_scheduler/internal/android/native_task_scheduler.h
+++ b/chromium/components/background_task_scheduler/internal/android/native_task_scheduler.h
@@ -13,14 +13,15 @@ namespace background_task {
 class NativeTaskScheduler : public BackgroundTaskScheduler {
  public:
   NativeTaskScheduler();
+
+  NativeTaskScheduler(const NativeTaskScheduler&) = delete;
+  NativeTaskScheduler& operator=(const NativeTaskScheduler&) = delete;
+
   ~NativeTaskScheduler() override;
 
   // BackgroundTaskScheduler overrides.
   bool Schedule(const TaskInfo& task_info) override;
   void Cancel(int task_id) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NativeTaskScheduler);
 };
 
 }  // namespace background_task
diff --git a/chromium/components/background_task_scheduler/task_info.h b/chromium/components/background_task_scheduler/task_info.h
index 91d77d57675..fef2abb451e 100644
--- a/chromium/components/background_task_scheduler/task_info.h
+++ b/chromium/components/background_task_scheduler/task_info.h
@@ -53,6 +53,10 @@ struct TaskInfo {
   // Warning: This functionality might get removed, check with OWNERS before
   // using this in new code: //components/background_task_scheduler/OWNERS.
   TaskInfo(int task_id, const ExactInfo& timing_info);
+
+  TaskInfo(const TaskInfo&) = delete;
+  TaskInfo& operator=(const TaskInfo&) = delete;
+
   ~TaskInfo();
 
   // A Java counterpart will be generated for this enum.
@@ -77,8 +81,6 @@ struct TaskInfo {
   absl::optional<PeriodicInfo> periodic_info;
   absl::optional<OneOffInfo> one_off_info;
   absl::optional<ExactInfo> exact_info;
-
-  DISALLOW_COPY_AND_ASSIGN(TaskInfo);
 };
 
 }  // namespace background_task