BASELINE: Update Chromium to 85.0.4183.14085-based

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

5 files changed, 15 insertions, 11 deletions

diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java
index 1f2062983dd..40522b0b744 100644
--- a/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java
+++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/BindingManagerTest.java
@@ -23,8 +23,8 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.process_launcher.ChildProcessConnection;
+import org.chromium.base.process_launcher.TestChildProcessConnection;
 import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.base.test.TestChildProcessConnection;
 import org.chromium.base.test.util.Feature;
 
 import java.util.ArrayList;
diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java
index 5175b7032f4..823891d0f66 100644
--- a/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java
+++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/ChildProcessRankingTest.java
@@ -13,8 +13,8 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.process_launcher.ChildProcessConnection;
+import org.chromium.base.process_launcher.TestChildProcessConnection;
 import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.base.test.TestChildProcessConnection;
 import org.chromium.content_public.browser.ChildProcessImportance;
 
 /** Unit tests for ChildProessRanking */
diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java
index fa65ca16c01..f4fea4d63fe 100644
--- a/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java
+++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/CriteriaHelperTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue;
 import static org.chromium.base.task.TaskTraits.THREAD_POOL;
 import static org.chromium.content_public.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL;
 
-import android.support.test.filters.MediumTest;
+import androidx.test.filters.MediumTest;
 
 import org.junit.Assert;
 import org.junit.Rule;
@@ -25,6 +25,7 @@ import org.chromium.base.task.PostTask;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
+import org.chromium.content_public.browser.test.util.CriteriaNotSatisfiedException;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -245,7 +246,7 @@ public class CriteriaHelperTest {
         }, 0, DEFAULT_POLLING_INTERVAL);
     }
 
-    private String getStackTrace(AssertionError e) {
+    private String getStackTrace(Throwable e) {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw));
         return sw.toString();
@@ -255,7 +256,9 @@ public class CriteriaHelperTest {
     @MediumTest
     public void testStack_Runnable_UiThread() {
         try {
-            CriteriaHelper.pollUiThread((Runnable) Assert::fail, 0, DEFAULT_POLLING_INTERVAL);
+            CriteriaHelper.pollUiThread(() -> {
+                throw new CriteriaNotSatisfiedException("test");
+            }, 0, DEFAULT_POLLING_INTERVAL);
         } catch (AssertionError e) {
             assertThat(getStackTrace(e),
                     containsString("CriteriaHelperTest.testStack_Runnable_UiThread("));
@@ -268,8 +271,9 @@ public class CriteriaHelperTest {
     @MediumTest
     public void testStack_Runnable_InstrumentationThread() {
         try {
-            CriteriaHelper.pollInstrumentationThread(
-                    (Runnable) Assert::fail, 0, DEFAULT_POLLING_INTERVAL);
+            CriteriaHelper.pollInstrumentationThread(() -> {
+                throw new CriteriaNotSatisfiedException("test");
+            }, 0, DEFAULT_POLLING_INTERVAL);
         } catch (AssertionError e) {
             assertThat(getStackTrace(e),
                     containsString("CriteriaHelperTest.testStack_Runnable_InstrumentationThread("));
diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java
index f2ba7649bc2..79a99c84750 100644
--- a/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java
+++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java
@@ -27,8 +27,8 @@ import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.process_launcher.ChildConnectionAllocator;
 import org.chromium.base.process_launcher.ChildProcessConnection;
+import org.chromium.base.process_launcher.TestChildProcessConnection;
 import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.base.test.TestChildProcessConnection;
 import org.chromium.base.test.util.Feature;
 
 /** Unit tests for the SpareChildConnection class. */
@@ -53,8 +53,8 @@ public class SpareChildConnectionTest {
 
         @Override
         public ChildProcessConnection createConnection(Context context, ComponentName serviceName,
-                boolean bindToCaller, boolean bindAsExternalService, Bundle serviceBundle,
-                String instanceName) {
+                ComponentName fallbackServiceName, boolean bindToCaller,
+                boolean bindAsExternalService, Bundle serviceBundle, String instanceName) {
             // We expect to create only one connection in these tests.
             assert mConnection == null;
             mConnection = new TestChildProcessConnection(
diff --git a/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java b/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java
index 17090971211..8e2140d5f0b 100644
--- a/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java
+++ b/chromium/content/public/android/junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java
@@ -7,7 +7,7 @@ package org.chromium.content.browser;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;