BASELINE: Update Chromium to 98.0.4758.90

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

7 files changed, 8 insertions, 10 deletions

diff --git a/chromium/components/background_task_scheduler/background_task.h b/chromium/components/background_task_scheduler/background_task.h
index 0c94a32ea7e..cd1b1e88bdb 100644
--- a/chromium/components/background_task_scheduler/background_task.h
+++ b/chromium/components/background_task_scheduler/background_task.h
@@ -6,7 +6,6 @@
 #define COMPONENTS_BACKGROUND_TASK_SCHEDULER_BACKGROUND_TASK_H_
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "components/background_task_scheduler/task_parameters.h"
 #include "components/keyed_service/core/simple_factory_key.h"
 
diff --git a/chromium/components/background_task_scheduler/background_task_scheduler.h b/chromium/components/background_task_scheduler/background_task_scheduler.h
index 776a8e9d0a4..b42f4348d29 100644
--- a/chromium/components/background_task_scheduler/background_task_scheduler.h
+++ b/chromium/components/background_task_scheduler/background_task_scheduler.h
@@ -6,7 +6,6 @@
 #define COMPONENTS_BACKGROUND_TASK_SCHEDULER_BACKGROUND_TASK_SCHEDULER_H_
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "components/background_task_scheduler/task_info.h"
 #include "components/keyed_service/core/keyed_service.h"
 
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 c1444ddb947..d68eb5150e2 100644
--- a/chromium/components/background_task_scheduler/background_task_scheduler_factory.h
+++ b/chromium/components/background_task_scheduler/background_task_scheduler_factory.h
@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "components/keyed_service/core/simple_keyed_service_factory.h"
 
 class SimpleFactoryKey;
diff --git a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java
index ccf51f905c9..9e2844f7109 100644
--- a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java
+++ b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java
@@ -95,9 +95,9 @@ public class BackgroundTaskSchedulerUmaTest {
                         TaskIds.OFFLINE_PAGES_PREFETCH_NOTIFICATION_JOB_ID));
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_WEBAPK_UPDATE,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(TaskIds.WEBAPK_UPDATE_JOB_ID));
-        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_DOWNLOAD_RESUMPTION,
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_DEPRECATED_DOWNLOAD_RESUMPTION,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
-                        TaskIds.DOWNLOAD_RESUMPTION_JOB_ID));
+                        TaskIds.DEPRECATED_DOWNLOAD_RESUMPTION_JOB_ID));
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_FEED_REFRESH,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(TaskIds.FEED_REFRESH_JOB_ID));
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COMPONENT_UPDATE,
@@ -131,7 +131,10 @@ public class BackgroundTaskSchedulerUmaTest {
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_WEBVIEW_COMPONENT_UPDATE,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
                         TaskIds.WEBVIEW_COMPONENT_UPDATE_JOB_ID));
-        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COUNT, 28);
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_ATTRIBUTION_PROVIDER_FLUSH,
+                BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
+                        TaskIds.ATTRIBUTION_PROVIDER_FLUSH_JOB_ID));
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COUNT, 29);
     }
 
     @Test
diff --git a/chromium/components/background_task_scheduler/task_ids.h b/chromium/components/background_task_scheduler/task_ids.h
index 2cd6392fc5d..067e1111201 100644
--- a/chromium/components/background_task_scheduler/task_ids.h
+++ b/chromium/components/background_task_scheduler/task_ids.h
@@ -35,7 +35,7 @@ enum class TaskIds {
   DOWNLOAD_CLEANUP_JOB_ID = 54,
   WEBVIEW_VARIATIONS_SEED_FETCH_JOB_ID = 83,
   WEBAPK_UPDATE_JOB_ID = 91,
-  DOWNLOAD_RESUMPTION_JOB_ID = 55,
+  DEPRECATED_DOWNLOAD_RESUMPTION_JOB_ID = 55,
   DOWNLOAD_AUTO_RESUMPTION_JOB_ID = 56,
   DOWNLOAD_LATER_JOB_ID = 57,
   FEED_REFRESH_JOB_ID = 22,
@@ -51,6 +51,7 @@ enum class TaskIds {
   OFFLINE_MEASUREMENT_JOB_ID = 108,
   WEBFEEDS_REFRESH_JOB_ID = 109,
   WEBVIEW_COMPONENT_UPDATE_JOB_ID = 110,
+  ATTRIBUTION_PROVIDER_FLUSH_JOB_ID = 111,
 };
 
 }  // namespace background_task
diff --git a/chromium/components/background_task_scheduler/task_info.h b/chromium/components/background_task_scheduler/task_info.h
index fef2abb451e..63bf88961fc 100644
--- a/chromium/components/background_task_scheduler/task_info.h
+++ b/chromium/components/background_task_scheduler/task_info.h
@@ -8,7 +8,6 @@
 #include <stdint.h>
 #include <string>
 
-#include "base/macros.h"
 #include "components/background_task_scheduler/task_ids.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
diff --git a/chromium/components/background_task_scheduler/task_parameters.h b/chromium/components/background_task_scheduler/task_parameters.h
index 90c505f21dd..6280acb4302 100644
--- a/chromium/components/background_task_scheduler/task_parameters.h
+++ b/chromium/components/background_task_scheduler/task_parameters.h
@@ -7,8 +7,6 @@
 
 #include <string>
 
-#include "base/macros.h"
-
 namespace background_task {
 
 // TaskParameters are passed to BackgroundTask whenever they are invoked. It