BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 38 insertions, 3 deletions

diff --git a/chromium/weblayer/browser/android/javatests/BUILD.gn b/chromium/weblayer/browser/android/javatests/BUILD.gn
index 867ce21663e..d069ae4c405 100644
--- a/chromium/weblayer/browser/android/javatests/BUILD.gn
+++ b/chromium/weblayer/browser/android/javatests/BUILD.gn
@@ -9,7 +9,6 @@ import("//build/config/android/rules.gni")
 android_library("weblayer_java_tests") {
   testonly = true
   sources = [
-    "src/org/chromium/weblayer/test/BottomControlsTest.java",
     "src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java",
     "src/org/chromium/weblayer/test/CookieManagerTest.java",
     "src/org/chromium/weblayer/test/CrashReporterTest.java",
@@ -17,18 +16,17 @@ android_library("weblayer_java_tests") {
     "src/org/chromium/weblayer/test/DowngradeTest.java",
     "src/org/chromium/weblayer/test/DownloadCallbackTest.java",
     "src/org/chromium/weblayer/test/ErrorPageCallbackTest.java",
-    "src/org/chromium/weblayer/test/EventUtils.java",
     "src/org/chromium/weblayer/test/ExecuteScriptTest.java",
     "src/org/chromium/weblayer/test/ExternalNavigationTest.java",
     "src/org/chromium/weblayer/test/FindInPageTest.java",
     "src/org/chromium/weblayer/test/FullscreenCallbackTest.java",
     "src/org/chromium/weblayer/test/InputTypesTest.java",
     "src/org/chromium/weblayer/test/NavigationTest.java",
-    "src/org/chromium/weblayer/test/NewTabCallbackImpl.java",
     "src/org/chromium/weblayer/test/NewTabCallbackTest.java",
     "src/org/chromium/weblayer/test/OnTabRemovedTabListCallbackImpl.java",
     "src/org/chromium/weblayer/test/ProfileTest.java",
     "src/org/chromium/weblayer/test/RenderingTest.java",
+    "src/org/chromium/weblayer/test/SiteSettingsTest.java",
     "src/org/chromium/weblayer/test/SmokeTest.java",
     "src/org/chromium/weblayer/test/TabCallbackTest.java",
     "src/org/chromium/weblayer/test/TabListCallbackTest.java",
@@ -37,6 +35,7 @@ android_library("weblayer_java_tests") {
     "src/org/chromium/weblayer/test/TopControlsTest.java",
     "src/org/chromium/weblayer/test/WebLayerLoadingTest.java",
     "src/org/chromium/weblayer/test/WebLayerTest.java",
+    "src/org/chromium/weblayer/test/WebMessageTest.java",
     "src/org/chromium/weblayer/test/WebViewCompatibilityTest.java",
   ]
   deps = [
@@ -49,8 +48,10 @@ android_library("weblayer_java_tests") {
     "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
+    "//third_party/android_deps:espresso_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit:junit",
     "//weblayer/browser/java:interfaces_java",
     "//weblayer/public/java",
@@ -62,12 +63,17 @@ android_library("weblayer_java_tests") {
 android_library("weblayer_private_java_tests") {
   testonly = true
   sources = [
+    "src/org/chromium/weblayer/test/BrowserControlsTest.java",
     "src/org/chromium/weblayer/test/GeolocationTest.java",
+    "src/org/chromium/weblayer/test/InfoBarTest.java",
     "src/org/chromium/weblayer/test/MediaCaptureTest.java",
     "src/org/chromium/weblayer/test/NetworkChangeNotifierTest.java",
+    "src/org/chromium/weblayer/test/PopupTest.java",
     "src/org/chromium/weblayer/test/ResourceLoadingTest.java",
+    "src/org/chromium/weblayer/test/TranslateTest.java",
   ]
   deps = [
+    ":weblayer_java_private_test_support",
     ":weblayer_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -77,6 +83,7 @@ android_library("weblayer_private_java_tests") {
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit:junit",
     "//weblayer/public/java",
     "//weblayer/public/javatestutil:test_java",
@@ -88,11 +95,15 @@ android_library("weblayer_java_test_support") {
   testonly = true
   sources = [
     "src/org/chromium/weblayer/test/BoundedCountDownLatch.java",
+    "src/org/chromium/weblayer/test/EventUtils.java",
     "src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java",
     "src/org/chromium/weblayer/test/MinWebLayerVersion.java",
     "src/org/chromium/weblayer/test/MinWebLayerVersionSkipCheck.java",
     "src/org/chromium/weblayer/test/NavigationWaiter.java",
+    "src/org/chromium/weblayer/test/NewTabCallbackImpl.java",
     "src/org/chromium/weblayer/test/ResourceUtil.java",
+    "src/org/chromium/weblayer/test/SiteSettingsActivityTestRule.java",
+    "src/org/chromium/weblayer/test/WebLayerActivityTestRule.java",
     "src/org/chromium/weblayer/test/WebLayerJUnit4ClassRunner.java",
   ]
   deps = [
@@ -101,8 +112,28 @@ android_library("weblayer_java_test_support") {
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
     "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/android_deps:androidx_fragment_fragment_java",
+    "//third_party/android_support_test_runner:rules_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/hamcrest:hamcrest_java",
+    "//third_party/junit:junit",
+    "//weblayer/public/java",
+    "//weblayer/shell/android:weblayer_shell_java",
+  ]
+}
+
+android_library("weblayer_java_private_test_support") {
+  testonly = true
+  sources = [ "src/org/chromium/weblayer/test/BrowserControlsHelper.java" ]
+  deps = [
+    ":weblayer_java_test_support",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//content/public/test/android:content_java_test_support",
     "//third_party/hamcrest:hamcrest_java",
+    "//third_party/junit:junit",
     "//weblayer/public/java",
+    "//weblayer/public/javatestutil:test_java",
     "//weblayer/shell/android:weblayer_shell_java",
   ]
 }
@@ -195,11 +226,15 @@ android_test_apk("weblayer_bundle_test_apk") {
   ]
   deps = [
     ":weblayer_java_test_support",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit:junit",
     "//weblayer/public/java",
     "//weblayer/public/javatestutil:test_java",
+    "//weblayer/shell/android:weblayer_shell_java",
   ]
   never_incremental = true
 }