BASELINE: Update Chromium to 90.0.4430.221

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

9 files changed, 40 insertions, 16 deletions

diff --git a/chromium/components/background_task_scheduler/BUILD.gn b/chromium/components/background_task_scheduler/BUILD.gn
index a24e667918e..4417a697fdb 100644
--- a/chromium/components/background_task_scheduler/BUILD.gn
+++ b/chromium/components/background_task_scheduler/BUILD.gn
@@ -60,7 +60,7 @@ if (is_android) {
   # between WebView and Chrome.
   android_library("background_task_scheduler_task_ids_java") {
     srcjar_deps = [ ":jni_enums" ]
-    deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+    deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
   }
 
   java_cpp_enum("jni_enums") {
@@ -84,8 +84,8 @@ if (is_android) {
     deps = [
       ":background_task_scheduler_task_ids_java",
       "//base:base_java",
-      "//content/public/android:content_java",
-      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//content/public/android:content_main_dex_java",
+      "//third_party/androidx:androidx_annotation_annotation_java",
     ]
   }
 
@@ -95,7 +95,7 @@ if (is_android) {
     deps = [
       ":public_java",
       "internal:internal_java",
-      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/androidx:androidx_annotation_annotation_java",
     ]
   }
 
diff --git a/chromium/components/background_task_scheduler/DIR_METADATA b/chromium/components/background_task_scheduler/DIR_METADATA
new file mode 100644
index 00000000000..dc57d9bc775
--- /dev/null
+++ b/chromium/components/background_task_scheduler/DIR_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/OWNERS b/chromium/components/background_task_scheduler/OWNERS
index d0e05981a84..4088b5659b7 100644
--- a/chromium/components/background_task_scheduler/OWNERS
+++ b/chromium/components/background_task_scheduler/OWNERS
@@ -8,7 +8,3 @@ shaktisahu@chromium.org
 
 # Everyone can add new TaskIds. For structural changes, ask component OWNERS.
 per-file task_ids.h=*
-
-# COMPONENT: Internals>BackgroundTaskScheduler
-# TEAM: clank-dev@google.com
-# OS: Android
diff --git a/chromium/components/background_task_scheduler/README.md b/chromium/components/background_task_scheduler/README.md
index be04a3d9ccd..6ae425ddd07 100644
--- a/chromium/components/background_task_scheduler/README.md
+++ b/chromium/components/background_task_scheduler/README.md
@@ -235,7 +235,7 @@ task.
 After the advent of servicfication in chrome, we have the option of launching a
 background task in a reduced service manager only mode without the need to
 launch the full browser process. In order to enable this, you have to override
-`NativeBackgroundTask#supportsServiceManagerOnly` and return true or false
+`NativeBackgroundTask#supportsMinimalBrowser` and return true or false
 depending on whether you want to launch service-manager only mode or full
 browser.
 
diff --git a/chromium/components/background_task_scheduler/internal/BUILD.gn b/chromium/components/background_task_scheduler/internal/BUILD.gn
index 3bbe8e393d3..0af77044bd8 100644
--- a/chromium/components/background_task_scheduler/internal/BUILD.gn
+++ b/chromium/components/background_task_scheduler/internal/BUILD.gn
@@ -34,10 +34,10 @@ if (is_android) {
       "//base:base_java",
       "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
       "//components/background_task_scheduler:public_java",
-      "//content/public/android:content_java",
-      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//content/public/android:content_main_dex_java",
       "//third_party/android_deps:chromium_play_services_availability_java",
       "//third_party/android_deps:protobuf_lite_runtime_java",
+      "//third_party/androidx:androidx_annotation_annotation_java",
     ]
   }
 
@@ -74,7 +74,7 @@ if (is_android) {
       "//base:jni_java",
       "//components/background_task_scheduler:factory_java",
       "//components/background_task_scheduler:public_java",
-      "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/androidx:androidx_annotation_annotation_java",
     ]
   }
 
@@ -108,8 +108,8 @@ if (is_android) {
       "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
       "//components/background_task_scheduler:public_java",
       "//content/public/test/android:content_java_test_support",
-      "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/android_support_test_runner:runner_java",
+      "//third_party/androidx:androidx_test_runner_java",
       "//third_party/junit",
     ]
   }
diff --git a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java
index 2bfe0b9c048..1b228e7dfbd 100644
--- a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java
+++ b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java
@@ -14,6 +14,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
 import org.chromium.base.ContextUtils;
+import org.chromium.base.IntentUtils;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.components.background_task_scheduler.TaskIds;
@@ -48,7 +49,9 @@ public class BackgroundTaskSchedulerAlarmManagerTest {
                         .putExtra(BackgroundTaskSchedulerAlarmManager.BACKGROUND_TASK_ID_KEY,
                                 TaskIds.TEST);
         assertEquals(PendingIntent.getBroadcast(ContextUtils.getApplicationContext(), TaskIds.TEST,
-                             intent, PendingIntent.FLAG_CANCEL_CURRENT),
+                             intent,
+                             PendingIntent.FLAG_CANCEL_CURRENT
+                                     | IntentUtils.getPendingIntentMutabilityFlag(false)),
                 pendingIntent);
     }
 }
diff --git a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java
index c29abef0187..c9656fc1b31 100644
--- a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java
+++ b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java
@@ -149,9 +149,23 @@ public class BackgroundTaskSchedulerImplTest {
 
     @Test
     @Feature({"BackgroundTaskScheduler"})
+    public void testIsScheduled() {
+        BackgroundTaskSchedulerPrefs.addScheduledTask(mTask);
+        assertTrue(BackgroundTaskSchedulerFactoryInternal.getScheduler().isScheduled(
+                RuntimeEnvironment.application, TaskIds.TEST));
+
+        doNothing().when(mDelegate).cancel(eq(RuntimeEnvironment.application), eq(TaskIds.TEST));
+        BackgroundTaskSchedulerFactoryInternal.getScheduler().cancel(
+                RuntimeEnvironment.application, TaskIds.TEST);
+        verify(mDelegate, times(1)).cancel(eq(RuntimeEnvironment.application), eq(TaskIds.TEST));
+        assertFalse(BackgroundTaskSchedulerFactoryInternal.getScheduler().isScheduled(
+                RuntimeEnvironment.application, TaskIds.TEST));
+    }
+
+    @Test
+    @Feature({"BackgroundTaskScheduler"})
     public void testCancelExactTask() {
         BackgroundTaskSchedulerPrefs.addScheduledTask(mExactTask);
-
         doNothing()
                 .when(mAlarmManagerDelegate)
                 .cancel(eq(RuntimeEnvironment.application), eq(TaskIds.TEST));
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 20d04de27c2..1fd8be9849b 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
@@ -125,7 +125,10 @@ public class BackgroundTaskSchedulerUmaTest {
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(TaskIds.QUERY_TILE_JOB_ID));
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_FEEDV2_REFRESH,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(TaskIds.FEEDV2_REFRESH_JOB_ID));
-        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COUNT, 26);
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_OFFLINE_MEASUREMENTS,
+                BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
+                        TaskIds.OFFLINE_MEASUREMENT_JOB_ID));
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COUNT, 27);
     }
 
     @Test
diff --git a/chromium/components/background_task_scheduler/task_ids.h b/chromium/components/background_task_scheduler/task_ids.h
index d9fea21eda6..ed0e3356943 100644
--- a/chromium/components/background_task_scheduler/task_ids.h
+++ b/chromium/components/background_task_scheduler/task_ids.h
@@ -48,6 +48,7 @@ enum class TaskIds {
   PERIODIC_BACKGROUND_SYNC_CHROME_WAKEUP_TASK_JOB_ID = 105,
   QUERY_TILE_JOB_ID = 106,
   FEEDV2_REFRESH_JOB_ID = 107,
+  OFFLINE_MEASUREMENT_JOB_ID = 108,
 };
 
 }  // namespace background_task