BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0

Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 22 insertions, 4 deletions

diff --git a/chromium/components/background_task_scheduler/BUILD.gn b/chromium/components/background_task_scheduler/BUILD.gn
index 244584d8764..dea0bb6caaa 100644
--- a/chromium/components/background_task_scheduler/BUILD.gn
+++ b/chromium/components/background_task_scheduler/BUILD.gn
@@ -47,6 +47,8 @@ if (is_android) {
       "android/java/src/org/chromium/components/background_task_scheduler/TaskParameters.java",
     ]
 
+    proguard_configs = [ "android/proguard.flags" ]
+
     deps = [
       ":background_task_scheduler_task_ids_java",
       "$google_play_services_package:google_play_services_base_java",
@@ -68,6 +70,7 @@ if (is_android) {
 
     deps = [
       ":background_task_scheduler_java",
+      ":background_task_scheduler_task_ids_java",
       "$google_play_services_package:google_play_services_base_java",
       "$google_play_services_package:google_play_services_basement_java",
       "$google_play_services_package:google_play_services_gcm_java",
diff --git a/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java b/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java
index aefcaae0718..95b34c004a2 100644
--- a/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java
+++ b/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUma.java
@@ -33,9 +33,10 @@ class BackgroundTaskSchedulerUma {
     static final int BACKGROUND_TASK_DOWNLOAD_RESUMPTION = 13;
     static final int BACKGROUND_TASK_FEED_REFRESH = 14;
     static final int BACKGROUND_TASK_COMPONENT_UPDATE = 15;
-    static final int BACKGROUND_TASK_EXPLORE_SITES_REFRESH = 16;
+    static final int BACKGROUND_TASK_DEPRECATED_EXPLORE_SITES_REFRESH = 16;
+    static final int BACKGROUND_TASK_EXPLORE_SITES_REFRESH = 17;
     // Keep this one at the end and increment appropriately when adding new tasks.
-    static final int BACKGROUND_TASK_COUNT = 17;
+    static final int BACKGROUND_TASK_COUNT = 18;
 
     static final String KEY_CACHED_UMA = "bts_cached_uma";
 
@@ -254,6 +255,8 @@ class BackgroundTaskSchedulerUma {
                 return BACKGROUND_TASK_FEED_REFRESH;
             case TaskIds.COMPONENT_UPDATE_JOB_ID:
                 return BACKGROUND_TASK_COMPONENT_UPDATE;
+            case TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID:
+                return BACKGROUND_TASK_DEPRECATED_EXPLORE_SITES_REFRESH;
             case TaskIds.EXPLORE_SITES_REFRESH_JOB_ID:
                 return BACKGROUND_TASK_EXPLORE_SITES_REFRESH;
             default:
diff --git a/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java b/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java
index 2c545ac1618..a885f1cec55 100644
--- a/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java
+++ b/chromium/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java
@@ -28,7 +28,8 @@ public final class TaskIds {
     public static final int DOWNLOAD_RESUMPTION_JOB_ID = 55;
     public static final int FEED_REFRESH_JOB_ID = 22;
     public static final int COMPONENT_UPDATE_JOB_ID = 2;
-    public static final int EXPLORE_SITES_REFRESH_JOB_ID = 100;
+    public static final int DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID = 100;
+    public static final int EXPLORE_SITES_REFRESH_JOB_ID = 101;
 
     private TaskIds() {}
 }
diff --git a/chromium/components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUmaTest.java b/chromium/components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUmaTest.java
index 515cec377ee..8a9dc167d33 100644
--- a/chromium/components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUmaTest.java
+++ b/chromium/components/background_task_scheduler/android/junit/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerUmaTest.java
@@ -90,7 +90,10 @@ public class BackgroundTaskSchedulerUmaTest {
         assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_EXPLORE_SITES_REFRESH,
                 BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
                         TaskIds.EXPLORE_SITES_REFRESH_JOB_ID));
-        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COUNT, 17);
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_DEPRECATED_EXPLORE_SITES_REFRESH,
+                BackgroundTaskSchedulerUma.toUmaEnumValueFromTaskId(
+                        TaskIds.DEPRECATED_EXPLORE_SITES_REFRESH_JOB_ID));
+        assertEquals(BackgroundTaskSchedulerUma.BACKGROUND_TASK_COUNT, 18);
     }
 
     @Test
diff --git a/chromium/components/background_task_scheduler/android/proguard.flags b/chromium/components/background_task_scheduler/android/proguard.flags
new file mode 100644
index 00000000000..8b2ece5441b
--- /dev/null
+++ b/chromium/components/background_task_scheduler/android/proguard.flags
@@ -0,0 +1,8 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Classes are created via reflection, so may not be renamed.
+-keepnames class * implements org.chromium.components.background_task_scheduler.BackgroundTask {
+  public <init>();
+}