BASELINE: Update Chromium to 106.0.5249.126

Change-Id: Ib0bb21c437a7d1686e21c33f2d329f2ac425b7ab
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438936
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

8 files changed, 14 insertions, 471 deletions

diff --git a/chromium/components/background_task_scheduler/BUILD.gn b/chromium/components/background_task_scheduler/BUILD.gn
index 4417a697fdb..bd8ebd3c6bc 100644
--- a/chromium/components/background_task_scheduler/BUILD.gn
+++ b/chromium/components/background_task_scheduler/BUILD.gn
@@ -99,11 +99,13 @@ if (is_android) {
     ]
   }
 
-  java_library("components_background_task_scheduler_junit_tests") {
-    # Platform checks are broken for Robolectric. See https://crbug.com/1071638.
-    bypass_platform_checks = true
-    testonly = true
+  robolectric_library("components_background_task_scheduler_junit_tests") {
+    include_android_sdk = false
     sources = [
+      "internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplWithMockTest.java",
+      "internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java",
+      "internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverterTest.java",
+      "internal/android/java/src/org/chromium/components/background_task_scheduler/internal/MockBackgroundTaskSchedulerDelegate.java",
       "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskServiceTest.java",
       "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java",
       "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java",
@@ -132,8 +134,8 @@ if (is_android) {
       "//base:base_java_test_support",
       "//base:base_junit_test_support",
       "//components/background_task_scheduler:public_java",
+      "//content/public/test/android:content_java_test_support",
       "//third_party/android_deps:chromium_play_services_availability_shadows_java",
-      "//third_party/android_deps:robolectric_all_java",
       "//third_party/junit",
       "//third_party/mockito:mockito_java",
     ]
diff --git a/chromium/components/background_task_scheduler/internal/BUILD.gn b/chromium/components/background_task_scheduler/internal/BUILD.gn
index 1a63bcb3b52..7c27d4b683b 100644
--- a/chromium/components/background_task_scheduler/internal/BUILD.gn
+++ b/chromium/components/background_task_scheduler/internal/BUILD.gn
@@ -86,30 +86,4 @@ if (is_android) {
       "android/java/src/org/chromium/components/background_task_scheduler/internal/TaskInfoBridge.java",
     ]
   }
-
-  android_library("background_task_scheduler_javatests") {
-    testonly = true
-
-    sources = [
-      "android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplWithMockTest.java",
-      "android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java",
-      "android/javatests/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverterTest.java",
-      "android/javatests/src/org/chromium/components/background_task_scheduler/internal/MockBackgroundTaskSchedulerDelegate.java",
-    ]
-
-    deps = [
-      ":internal_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",
-      "$google_play_services_package:google_play_services_tasks_java",
-      "//base:base_java_test_support",
-      "//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_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/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplWithMockTest.java b/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplWithMockTest.java
deleted file mode 100644
index 113796378df..00000000000
--- a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplWithMockTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2019 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.
-
-package org.chromium.components.background_task_scheduler.internal;
-
-import androidx.test.filters.SmallTest;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.test.BaseJUnit4ClassRunner;
-import org.chromium.components.background_task_scheduler.BackgroundTaskScheduler;
-import org.chromium.components.background_task_scheduler.TaskIds;
-import org.chromium.components.background_task_scheduler.TaskInfo;
-import org.chromium.content_public.browser.test.util.TestThreadUtils;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Tests for {@link BackgroundTaskSchedulerImpl}.
- */
-@RunWith(BaseJUnit4ClassRunner.class)
-public class BackgroundTaskSchedulerImplWithMockTest {
-    private static final int TEST_MINUTES = 10;
-
-    private MockBackgroundTaskSchedulerDelegate mDelegate;
-    private BackgroundTaskScheduler mTaskScheduler;
-
-    @Before
-    public void setUp() {
-        mDelegate = new MockBackgroundTaskSchedulerDelegate();
-        mTaskScheduler = new BackgroundTaskSchedulerImpl(
-                mDelegate, new BackgroundTaskSchedulerAlarmManager());
-    }
-
-    @Test
-    @SmallTest
-    public void testOneOffTaskScheduling() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create()
-                        .setWindowEndTimeMs(TimeUnit.MINUTES.toMillis(TEST_MINUTES))
-                        .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { Assert.assertTrue(mTaskScheduler.schedule(null, oneOffTask)); });
-
-        Assert.assertEquals(oneOffTask, mDelegate.getScheduledTaskInfo());
-        Assert.assertEquals(0, mDelegate.getCanceledTaskId());
-    }
-
-    @Test
-    @SmallTest
-    public void testPeriodicTaskScheduling() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.PeriodicInfo.create()
-                        .setIntervalMs(TimeUnit.MINUTES.toMillis(TEST_MINUTES))
-                        .build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-
-        TestThreadUtils.runOnUiThreadBlocking(
-                () -> { Assert.assertTrue(mTaskScheduler.schedule(null, periodicTask)); });
-
-        Assert.assertEquals(periodicTask, mDelegate.getScheduledTaskInfo());
-        Assert.assertEquals(0, mDelegate.getCanceledTaskId());
-    }
-
-    @Test
-    @SmallTest
-    public void testTaskCanceling() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create()
-                        .setWindowEndTimeMs(TimeUnit.MINUTES.toMillis(TEST_MINUTES))
-                        .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            Assert.assertTrue(mTaskScheduler.schedule(null, oneOffTask));
-            mTaskScheduler.cancel(null, TaskIds.TEST);
-        });
-
-        Assert.assertEquals(null, mDelegate.getScheduledTaskInfo());
-        Assert.assertEquals(TaskIds.TEST, mDelegate.getCanceledTaskId());
-    }
-}
\ No newline at end of file
diff --git a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java b/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java
deleted file mode 100644
index 8a4b33e482c..00000000000
--- a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2017 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.
-
-package org.chromium.components.background_task_scheduler.internal;
-
-import android.app.job.JobInfo;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.support.test.InstrumentationRegistry;
-
-import androidx.test.filters.SmallTest;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.test.BaseJUnit4ClassRunner;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
-import org.chromium.components.background_task_scheduler.TaskIds;
-import org.chromium.components.background_task_scheduler.TaskInfo;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Tests for {@link BackgroundTaskSchedulerJobService}.
- */
-@RunWith(BaseJUnit4ClassRunner.class)
-@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
-public class BackgroundTaskSchedulerJobServiceTest {
-    private static final long CLOCK_TIME_MS = 1415926535000L;
-    private static final long TIME_50_MIN_TO_MS = TimeUnit.MINUTES.toMillis(50);
-    private static final long TIME_100_MIN_TO_MS = TimeUnit.MINUTES.toMillis(100);
-    private static final long TIME_200_MIN_TO_MS = TimeUnit.MINUTES.toMillis(200);
-    private static final long END_TIME_WITH_DEADLINE_MS =
-            TIME_200_MIN_TO_MS + BackgroundTaskSchedulerJobService.DEADLINE_DELTA_MS;
-
-    private BackgroundTaskSchedulerJobService.Clock mClock = () -> CLOCK_TIME_MS;
-
-    @Before
-    public void setUp() {
-        BackgroundTaskSchedulerJobService.setClockForTesting(mClock);
-    }
-
-    @Test
-    @SmallTest
-    public void testOneOffTaskWithDeadline() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), oneOffTask);
-        Assert.assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
-        Assert.assertFalse(jobInfo.isPeriodic());
-        Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getMaxExecutionDelayMillis());
-    }
-
-    @Test
-    @SmallTest
-    public void testOneOffTaskWithDeadlineAndExpiration() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), oneOffTask);
-        Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
-        Assert.assertEquals(CLOCK_TIME_MS,
-                jobInfo.getExtras().getLong(BackgroundTaskSchedulerGcmNetworkManager
-                                                    .BACKGROUND_TASK_SCHEDULE_TIME_KEY));
-        Assert.assertEquals(TIME_200_MIN_TO_MS,
-                jobInfo.getExtras().getLong(
-                        BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_END_TIME_KEY));
-    }
-
-    @Test
-    @SmallTest
-    public void testOneOffTaskWithWindow() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(TIME_100_MIN_TO_MS)
-                                                 .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), oneOffTask);
-        Assert.assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
-        Assert.assertFalse(jobInfo.isPeriodic());
-        Assert.assertEquals(TIME_100_MIN_TO_MS, jobInfo.getMinLatencyMillis());
-        Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getMaxExecutionDelayMillis());
-    }
-
-    @Test
-    @SmallTest
-    public void testOneOffTaskWithWindowAndExpiration() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
-                                                 .setWindowStartTimeMs(TIME_100_MIN_TO_MS)
-                                                 .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
-                                                 .setExpiresAfterWindowEndTime(true)
-                                                 .build();
-        TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), oneOffTask);
-        Assert.assertEquals(
-                oneOffTask.getOneOffInfo().getWindowStartTimeMs(), jobInfo.getMinLatencyMillis());
-        Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
-        Assert.assertEquals(CLOCK_TIME_MS,
-                jobInfo.getExtras().getLong(BackgroundTaskSchedulerGcmNetworkManager
-                                                    .BACKGROUND_TASK_SCHEDULE_TIME_KEY));
-        Assert.assertEquals(TIME_200_MIN_TO_MS,
-                jobInfo.getExtras().getLong(
-                        BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_END_TIME_KEY));
-    }
-
-    @Test
-    @SmallTest
-    public void testPeriodicTaskWithoutFlex() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.PeriodicInfo.create().setIntervalMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), periodicTask);
-        Assert.assertEquals(periodicTask.getTaskId(), jobInfo.getId());
-        Assert.assertTrue(jobInfo.isPeriodic());
-        Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getIntervalMillis());
-    }
-
-    @Test
-    @SmallTest
-    public void testPeriodicTaskWithFlex() {
-        TaskInfo.TimingInfo timingInfo = TaskInfo.PeriodicInfo.create()
-                                                 .setIntervalMs(TIME_200_MIN_TO_MS)
-                                                 .setFlexMs(TIME_50_MIN_TO_MS)
-                                                 .build();
-        TaskInfo periodicTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), periodicTask);
-        Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getIntervalMillis());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Assert.assertEquals(TIME_50_MIN_TO_MS, jobInfo.getFlexMillis());
-        }
-    }
-
-    @Test
-    @SmallTest
-    public void testTaskInfoWithExtras() {
-        Bundle taskExtras = new Bundle();
-        taskExtras.putString("foo", "bar");
-        taskExtras.putBoolean("bools", true);
-        taskExtras.putLong("longs", 1342543L);
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo oneOffTask =
-                TaskInfo.createTask(TaskIds.TEST, timingInfo).setExtras(taskExtras).build();
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(), oneOffTask);
-        Assert.assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
-        PersistableBundle jobExtras = jobInfo.getExtras();
-        PersistableBundle persistableBundle = jobExtras.getPersistableBundle(
-                BackgroundTaskSchedulerJobService.BACKGROUND_TASK_EXTRAS_KEY);
-        Assert.assertEquals(taskExtras.keySet().size(), persistableBundle.keySet().size());
-        Assert.assertEquals(taskExtras.getString("foo"), persistableBundle.getString("foo"));
-        Assert.assertEquals(taskExtras.getBoolean("bools"), persistableBundle.getBoolean("bools"));
-        Assert.assertEquals(taskExtras.getLong("longs"), persistableBundle.getLong("longs"));
-    }
-
-    @Test
-    @SmallTest
-    public void testTaskInfoWithManyConstraints() {
-        TaskInfo.TimingInfo timingInfo =
-                TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TIME_200_MIN_TO_MS).build();
-        TaskInfo.Builder taskBuilder = TaskInfo.createTask(TaskIds.TEST, timingInfo);
-
-        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(),
-                taskBuilder.setIsPersisted(true).build());
-        Assert.assertTrue(jobInfo.isPersisted());
-
-        jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(),
-                taskBuilder.setRequiredNetworkType(TaskInfo.NetworkType.UNMETERED).build());
-        Assert.assertEquals(JobInfo.NETWORK_TYPE_UNMETERED, jobInfo.getNetworkType());
-
-        jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
-                InstrumentationRegistry.getTargetContext(),
-                taskBuilder.setRequiresCharging(true).build());
-        Assert.assertTrue(jobInfo.isRequireCharging());
-    }
-}
diff --git a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverterTest.java b/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverterTest.java
deleted file mode 100644
index 2b82b3c0db2..00000000000
--- a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverterTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2017 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.
-
-package org.chromium.components.background_task_scheduler.internal;
-
-import android.os.Build;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-
-import androidx.test.filters.SmallTest;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.chromium.base.test.BaseJUnit4ClassRunner;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Set;
-
-/**
- * Tests for {@link BundleToPersistableBundleConverter}.
- */
-@RunWith(BaseJUnit4ClassRunner.class)
-@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
-public class BundleToPersistableBundleConverterTest {
-    @Test
-    @SmallTest
-    public void testAllValidConversions() {
-        Bundle bundle = new Bundle();
-        bundle.putString("s", "bar");
-        bundle.putStringArray("sa", new String[] {"b", "a", "r"});
-        bundle.putBoolean("b", true);
-        bundle.putBooleanArray("ba", new boolean[] {true, false, true});
-        bundle.putInt("i", 1342543);
-        bundle.putIntArray("ia", new int[] {1, 2, 3});
-        bundle.putLong("l", 1342543L);
-        bundle.putLongArray("la", new long[] {1L, 2L, 3L});
-        bundle.putDouble("d", 5.3223);
-        bundle.putDoubleArray("da", new double[] {5.3223, 42.42});
-
-        BundleToPersistableBundleConverter.Result result =
-                BundleToPersistableBundleConverter.convert(bundle);
-        PersistableBundle pBundle = result.getPersistableBundle();
-
-        Assert.assertFalse(result.hasErrors());
-        Assert.assertEquals(bundle.getString("s"), pBundle.getString("s"));
-        Assert.assertTrue(Arrays.equals(bundle.getStringArray("sa"), pBundle.getStringArray("sa")));
-        Assert.assertEquals(bundle.getBoolean("b"), pBundle.getBoolean("b"));
-        Assert.assertTrue(
-                Arrays.equals(bundle.getBooleanArray("ba"), pBundle.getBooleanArray("ba")));
-        Assert.assertEquals(bundle.getInt("i"), pBundle.getInt("i"));
-        Assert.assertTrue(Arrays.equals(bundle.getIntArray("ia"), pBundle.getIntArray("ia")));
-        Assert.assertEquals(bundle.getLong("l"), pBundle.getLong("l"));
-        Assert.assertTrue(Arrays.equals(bundle.getLongArray("la"), pBundle.getLongArray("la")));
-        Assert.assertEquals(bundle.getDouble("d"), pBundle.getDouble("d"), 0);
-        Assert.assertTrue(Arrays.equals(bundle.getDoubleArray("da"), pBundle.getDoubleArray("da")));
-    }
-
-    @Test
-    @SmallTest
-    public void testSomeBadConversions() {
-        Bundle bundle = new Bundle();
-        bundle.putString("s", "this should be there");
-        bundle.putByte("byte", (byte) 0x30);
-        bundle.putFloat("float", 14.04F);
-        ArrayList<String> arrayList = new ArrayList<>();
-        arrayList.add("a");
-        arrayList.add("b");
-        bundle.putStringArrayList("arrayList", arrayList);
-
-        BundleToPersistableBundleConverter.Result result =
-                BundleToPersistableBundleConverter.convert(bundle);
-
-        Assert.assertTrue(result.hasErrors());
-        Set<String> failedKeys = result.getFailedKeys();
-        Assert.assertEquals(3, failedKeys.size());
-        Assert.assertTrue(failedKeys.contains("byte"));
-        Assert.assertTrue(failedKeys.contains("float"));
-        Assert.assertTrue(failedKeys.contains("arrayList"));
-        Assert.assertEquals(bundle.getString("s"), result.getPersistableBundle().getString("s"));
-    }
-
-    @Test
-    @SmallTest
-    public void testNullValue() {
-        Bundle bundle = new Bundle();
-        bundle.putString("foo", "value1");
-        bundle.putString("bar", "");
-        bundle.putString("qux", null);
-
-        BundleToPersistableBundleConverter.Result result =
-                BundleToPersistableBundleConverter.convert(bundle);
-
-        Assert.assertFalse(result.hasErrors());
-        Assert.assertEquals(
-                bundle.getString("foo"), result.getPersistableBundle().getString("foo"));
-        Assert.assertEquals(
-                bundle.getString("bar"), result.getPersistableBundle().getString("bar"));
-        Assert.assertEquals(
-                bundle.getString("qux"), result.getPersistableBundle().getString("qux"));
-    }
-}
diff --git a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/MockBackgroundTaskSchedulerDelegate.java b/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/MockBackgroundTaskSchedulerDelegate.java
deleted file mode 100644
index 2b6079273d3..00000000000
--- a/chromium/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/MockBackgroundTaskSchedulerDelegate.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2019 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.
-
-package org.chromium.components.background_task_scheduler.internal;
-
-import android.content.Context;
-
-import org.chromium.components.background_task_scheduler.TaskInfo;
-
-/**
- * Mock of BackgroundTaskSchedulerDelegate that tracks which methods are called.
- * This is used for all delegates that cannot be included in end-to-end testing.
- */
-public class MockBackgroundTaskSchedulerDelegate implements BackgroundTaskSchedulerDelegate {
-    private TaskInfo mScheduledTaskInfo;
-    private int mCanceledTaskId;
-
-    @Override
-    public boolean schedule(Context context, TaskInfo taskInfo) {
-        mScheduledTaskInfo = taskInfo;
-        mCanceledTaskId = 0;
-        return true;
-    }
-
-    @Override
-    public void cancel(Context context, int taskId) {
-        mCanceledTaskId = taskId;
-        mScheduledTaskInfo = null;
-    }
-
-    public TaskInfo getScheduledTaskInfo() {
-        return mScheduledTaskInfo;
-    }
-
-    public int getCanceledTaskId() {
-        return mCanceledTaskId;
-    }
-
-    public void clear() {
-        mScheduledTaskInfo = null;
-        mCanceledTaskId = 0;
-    }
-}
\ No newline at end of file
diff --git a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java
index 90c0fd29cca..f308e92b06e 100644
--- a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java
+++ b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java
@@ -11,6 +11,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import android.app.job.JobParameters;
+import android.os.Build;
 import android.os.PersistableBundle;
 
 import org.junit.Before;
@@ -29,7 +30,7 @@ import java.util.concurrent.TimeUnit;
 
 /** Unit tests for {@link BackgroundTaskJobService}. */
 @RunWith(BaseRobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
+@Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.S)
 public class BackgroundTaskJobServiceTest {
     private static BackgroundTaskSchedulerJobService.Clock sClock = () -> 1415926535000L;
     private static BackgroundTaskSchedulerJobService.Clock sZeroClock = () -> 0L;
@@ -196,8 +197,8 @@ public class BackgroundTaskJobServiceTest {
 
         return new JobParameters(null /* callback */, taskId, extras, null /* transientExtras */,
                 null /* clipData */, 0 /* clipGrantFlags */, false /* overrideDeadlineExpired */,
-                null /* triggeredContentUris */, null /* triggeredContentAuthorities */,
-                null /* network */);
+                false /* isExpedited */, null /* triggeredContentUris */,
+                null /* triggeredContentAuthorities */, null /* network */);
     }
 
     private static JobParameters buildPeriodicJobParameters(
@@ -221,7 +222,7 @@ public class BackgroundTaskJobServiceTest {
 
         return new JobParameters(null /* callback */, taskId, extras, null /* transientExtras */,
                 null /* clipData */, 0 /* clipGrantFlags */, false /* overrideDeadlineExpired */,
-                null /* triggeredContentUris */, null /* triggeredContentAuthorities */,
-                null /* network */);
+                false /* isExpedited */, null /* triggeredContentUris */,
+                null /* triggeredContentAuthorities */, null /* network */);
     }
-}
\ No newline at end of file
+}
diff --git a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BroadcastReceiverRobolectricTest.java b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BroadcastReceiverRobolectricTest.java
index ca8b4e04bdb..89d969f01a4 100644
--- a/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BroadcastReceiverRobolectricTest.java
+++ b/chromium/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BroadcastReceiverRobolectricTest.java
@@ -11,7 +11,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.os.BatteryManager;
-import android.os.Build;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -26,7 +25,6 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.components.background_task_scheduler.BackgroundTask;
 import org.chromium.components.background_task_scheduler.BackgroundTaskFactory;
 import org.chromium.components.background_task_scheduler.TaskIds;
@@ -150,7 +148,6 @@ public final class BroadcastReceiverRobolectricTest {
     }
 
     @Test
-    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
     @Feature({"BackgroundTaskScheduler"})
     public void withChargingRequired() throws InterruptedException {
         // Set device in charging mode
@@ -200,7 +197,6 @@ public final class BroadcastReceiverRobolectricTest {
     }
 
     @Test
-    @MinAndroidSdkLevel(Build.VERSION_CODES.L)
     @Feature({"BackgroundTaskScheduler"})
     public void withAnyNetworkRequired() throws InterruptedException {
         mShadowConnectivityManager.setDefaultNetworkActive(true);
@@ -225,7 +221,6 @@ public final class BroadcastReceiverRobolectricTest {
     }
 
     @Test
-    @MinAndroidSdkLevel(Build.VERSION_CODES.M)
     @Feature({"BackgroundTaskScheduler"})
     public void withAnyNetworkRequiredButNoConnectivity() throws InterruptedException {
         mShadowConnectivityManager.setDefaultNetworkActive(false);