BASELINE: Update Chromium to 85.0.4183.14085-based

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

6 files changed, 101 insertions, 28 deletions

diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn
index 596b0aec0ae..ce102d9c3c8 100644
--- a/chromium/ios/chrome/test/BUILD.gn
+++ b/chromium/ios/chrome/test/BUILD.gn
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//ios/build/chrome_build.gni")
 import("//ios/build/config.gni")
 import("//ios/chrome/features.gni")
 import("//ios/public/provider/chrome/browser/build_config.gni")
-import("//ios/third_party/features.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
@@ -130,18 +130,16 @@ source_set("run_all_unittests") {
     "//mojo/core/embedder",
   ]
 
-  if (ios_third_party_material_components_built_as_framework) {
-    if (ios_chrome_links_with_material_components_framework) {
-      public_deps = [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    } else {
-      assert_no_deps = [
-        "//ios/third_party/material_components_ios:material_components_ios+bundle",
-        "//ios/third_party/material_components_ios:material_components_ios+link",
-      ]
-    }
+  if (ios_chrome_links_with_material_components_framework) {
+    public_deps = [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
+  } else {
+    assert_no_deps = [
+      "//ios/third_party/material_components_ios:material_components_ios+bundle",
+      "//ios/third_party/material_components_ios:material_components_ios+link",
+    ]
   }
 }
 
@@ -161,7 +159,16 @@ test("ios_chrome_perftests") {
   assert_no_deps = ios_assert_no_deps
 }
 
+bundle_data_ib_file("base_scene_storyboard") {
+  source = "BaseScene.storyboard"
+}
+
 test("ios_chrome_unittests") {
+  # Use the plist with the scene manifest if either multiwindow flag is enabled
+  if (ios_enable_multi_window || ios_enable_scene_startup) {
+    info_plist = "//ios/chrome/test/unittest-scene-lifecycle-Info.plist"
+  }
+
   deps = [
     # Ensure that all unit tests are run, use fake hooks and pack resources.
     ":run_all_unittests",
@@ -180,6 +187,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/browser_state:unit_tests",
     "//ios/chrome/browser/browsing_data:unit_tests",
     "//ios/chrome/browser/complex_tasks:unit_tests",
+    "//ios/chrome/browser/content_settings:unit_tests",
     "//ios/chrome/browser/crash_report:unit_tests",
     "//ios/chrome/browser/crash_report/breadcrumbs:unit_tests",
     "//ios/chrome/browser/credential_provider:unit_tests",
@@ -195,7 +203,10 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/infobars/overlays:unit_tests",
     "//ios/chrome/browser/infobars/overlays/browser_agent:unit_tests",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common:unit_tests",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm:unit_tests",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords:unit_tests",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card:unit_tests",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate:unit_tests",
     "//ios/chrome/browser/itunes_urls:unit_tests",
     "//ios/chrome/browser/json_parser:unit_tests",
     "//ios/chrome/browser/language:unit_tests",
@@ -254,7 +265,6 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/content_suggestions:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions/cells:unit_tests",
     "//ios/chrome/browser/ui/content_suggestions/identifier:unit_tests",
-    "//ios/chrome/browser/ui/context_menu:unit_tests",
     "//ios/chrome/browser/ui/dialogs:unit_tests",
     "//ios/chrome/browser/ui/dialogs:unit_tests_internal",
     "//ios/chrome/browser/ui/download:unit_tests",
@@ -281,8 +291,12 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/ui/overlays/infobar_banner:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_banner/confirm:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_banner/passwords:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/save_card:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/translate:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_modal:unit_tests",
     "//ios/chrome/browser/ui/overlays/infobar_modal/passwords:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/save_card:unit_tests",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/translate:unit_tests",
     "//ios/chrome/browser/ui/overlays/test_modality:unit_tests",
     "//ios/chrome/browser/ui/overlays/web_content_area/alerts:unit_tests",
     "//ios/chrome/browser/ui/popup_menu:unit_tests",
@@ -327,6 +341,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/common/ui/reauthentication:unit_tests",
     "//ios/chrome/common/ui/util:unit_tests",
     "//ios/chrome/content_widget_extension:unit_tests",
+    "//ios/chrome/credential_provider_extension:unit_tests",
     "//ios/chrome/search_widget_extension:unit_tests",
     "//ios/testing:http_server_bundle_data",
   ]
diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn
index cd239288e4c..94bb8b7912e 100644
--- a/chromium/ios/chrome/test/app/BUILD.gn
+++ b/chromium/ios/chrome/test/app/BUILD.gn
@@ -91,6 +91,7 @@ source_set("test_support") {
     "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin:fake_chrome_identity",
     "//ios/public/provider/chrome/browser/signin:test_support",
+    "//ios/third_party/material_components_ios",
     "//ios/web",
     "//ios/web/public/security",
     "//ios/web/public/test",
diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn
index 57b1ee85987..2dfe1d59e6e 100644
--- a/chromium/ios/chrome/test/earl_grey/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn
@@ -61,7 +61,7 @@ chrome_ios_eg_test("ios_chrome_bookmarks_egtests") {
 }
 
 chrome_ios_eg_test("ios_chrome_signin_egtests") {
-  deps = [ "//ios/chrome/browser/ui/signin_interaction:eg_tests" ]
+  deps = [ "//ios/chrome/browser/ui/authentication/signin:eg_tests" ]
 }
 
 chrome_ios_eg_test("ios_chrome_settings_egtests") {
@@ -74,11 +74,6 @@ chrome_ios_eg_test("ios_chrome_settings_egtests") {
     "//ios/chrome/browser/ui/settings/password:eg_tests",
     "//ios/chrome/browser/ui/settings/sync:eg_tests",
   ]
-
-  executable_args = [
-    "--args-json",
-    "{\"test_args\": [\"--enable-features=ClearSyncedData\"]}",
-  ]
   xctest = false
 }
 
@@ -121,16 +116,11 @@ chrome_ios_eg_test("ios_chrome_web_egtests") {
 }
 
 chrome_ios_eg_test("ios_chrome_multitasking_egtests") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "//ios/chrome/app/multitasking_test_application_delegate.h",
-    "//ios/chrome/app/multitasking_test_application_delegate.mm",
-  ]
-
   deps = [
     ":test_support",
     "//base",
     "//ios/chrome/app:app_internal",
+    "//ios/chrome/app:multitasking_test_app_delegate",
     "//ios/chrome/app/application_delegate:application_delegate_internal",
 
     # Depends on all EarlGrey test suites to create multitasking tests suite.
@@ -251,6 +241,7 @@ source_set("test_support") {
     "//components/browsing_data/core",
     "//components/content_settings/core/browser",
     "//components/metrics:demographic_metrics_provider",
+    "//components/prefs",
     "//components/strings",
     "//components/sync/base",
     "//components/translate/core/browser",
@@ -313,6 +304,7 @@ source_set("test_support") {
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web:tab_id_tab_helper",
     "//ios/chrome/test/app:test_support",
@@ -395,6 +387,7 @@ source_set("eg_app_support+eg2") {
     "//components/browsing_data/core",
     "//components/content_settings/core/browser",
     "//components/metrics:demographic_metrics_provider",
+    "//components/prefs",
     "//components/strings",
     "//components/sync/base",
     "//components/translate/core/browser",
@@ -469,7 +462,6 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/settings/password:password_constants",
     "//ios/chrome/browser/ui/settings/privacy:privacy_ui",
     "//ios/chrome/browser/ui/settings/sync",
-    "//ios/chrome/browser/ui/signin_interaction:eg_app_support+eg2",
     "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants",
     "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants",
     "//ios/chrome/browser/ui/table_view:feature_flags",
@@ -477,6 +469,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/toolbar:eg_app_support+eg2",
     "//ios/chrome/browser/ui/toolbar:toolbar_ui",
     "//ios/chrome/browser/ui/toolbar/public",
+    "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:eg_app_support+eg2",
     "//ios/chrome/browser/web:eg_app_support+eg2",
diff --git a/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni b/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
index 94ee25855e4..69697ec058a 100644
--- a/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
+++ b/chromium/ios/chrome/test/earl_grey/chrome_ios_eg_test.gni
@@ -73,6 +73,12 @@ template("chrome_ios_eg_test") {
       if (ios_chrome_info_plist_additions != []) {
         info_plists += ios_chrome_info_plist_additions
       }
+      if (ios_chrome_info_plist_addition_targets != []) {
+        if (!defined(deps)) {
+          deps = []
+        }
+        deps += ios_chrome_info_plist_addition_targets
+      }
       if (defined(invoker.extra_info_plists)) {
         info_plists += invoker.extra_info_plists
       }
diff --git a/chromium/ios/chrome/test/earl_grey2/BUILD.gn b/chromium/ios/chrome/test/earl_grey2/BUILD.gn
index 4331a7b9e60..35f4350a026 100644
--- a/chromium/ios/chrome/test/earl_grey2/BUILD.gn
+++ b/chromium/ios/chrome/test/earl_grey2/BUILD.gn
@@ -13,7 +13,9 @@ group("all_tests") {
     ":ios_chrome_bookmarks_eg2tests_module",
     ":ios_chrome_device_check_eg2tests_module",
     ":ios_chrome_eg2tests",
+    ":ios_chrome_flaky_eg2tests_module",
     ":ios_chrome_integration_eg2tests_module",
+    ":ios_chrome_multitasking_eg2tests_module",
     ":ios_chrome_settings_eg2tests_module",
     ":ios_chrome_signin_eg2tests_module",
     ":ios_chrome_smoke_eg2tests_module",
@@ -25,6 +27,11 @@ group("all_tests") {
 chrome_ios_eg2_test_app_host("ios_chrome_eg2tests") {
 }
 
+chrome_ios_eg2_test_app_host("ios_chrome_multitasking_eg2tests") {
+  deps = [ "//ios/chrome/app:multitasking_test_app_delegate" ]
+  eg_main_application_delegate = "MultitaskingTestApplicationDelegate"
+}
+
 chrome_ios_eg2_test("ios_chrome_autofill_automation_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -46,6 +53,21 @@ chrome_ios_eg2_test("ios_chrome_device_check_eg2tests_module") {
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 
+chrome_ios_eg2_test("ios_chrome_flaky_eg2tests_module") {
+  xcode_test_application_name = "ios_chrome_eg2tests"
+
+  deps = [
+    ":ios_chrome_bookmarks_eg2tests_module_deps_group",
+    ":ios_chrome_integration_eg2tests_module_deps_group",
+    ":ios_chrome_settings_eg2tests_module_deps_group",
+    ":ios_chrome_signin_eg2tests_module_deps_group",
+    ":ios_chrome_smoke_eg2tests_module_deps_group",
+    ":ios_chrome_ui_eg2tests_module_deps_group",
+    ":ios_chrome_web_eg2tests_module_deps_group",
+  ]
+  data_deps = [ ":ios_chrome_eg2tests" ]
+}
+
 chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -61,6 +83,7 @@ chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
     "//ios/chrome/browser/policy:eg2_tests",
     "//ios/chrome/browser/policy_url_blocking:eg2_tests",
     "//ios/chrome/browser/prerender:eg2_tests",
+    "//ios/chrome/browser/safe_browsing:eg2_tests",
     "//ios/chrome/browser/translate:eg2_tests",
     "//ios/chrome/browser/ui/autofill:eg2_tests",
     "//ios/chrome/browser/ui/autofill/manual_fill:eg2_tests",
@@ -70,6 +93,21 @@ chrome_ios_eg2_test("ios_chrome_integration_eg2tests_module") {
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 
+chrome_ios_eg2_test("ios_chrome_multitasking_eg2tests_module") {
+  xcode_test_application_name = "ios_chrome_multitasking_eg2tests"
+
+  deps = [
+    ":ios_chrome_bookmarks_eg2tests_module_deps_group",
+    ":ios_chrome_integration_eg2tests_module_deps_group",
+    ":ios_chrome_settings_eg2tests_module_deps_group",
+    ":ios_chrome_signin_eg2tests_module_deps_group",
+    ":ios_chrome_smoke_eg2tests_module_deps_group",
+    ":ios_chrome_ui_eg2tests_module_deps_group",
+    ":ios_chrome_web_eg2tests_module_deps_group",
+  ]
+  data_deps = [ ":ios_chrome_multitasking_eg2tests" ]
+}
+
 chrome_ios_eg2_test("ios_chrome_smoke_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
@@ -95,7 +133,7 @@ chrome_ios_eg2_test("ios_chrome_settings_eg2tests_module") {
 chrome_ios_eg2_test("ios_chrome_signin_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
-  deps = [ "//ios/chrome/browser/ui/signin_interaction:eg2_tests" ]
+  deps = [ "//ios/chrome/browser/ui/authentication/signin:eg2_tests" ]
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 
diff --git a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
index 9e7f101d9e7..a0685c3e06c 100644
--- a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
+++ b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
@@ -33,6 +33,12 @@ template("chrome_ios_eg2_test_app_host") {
       if (ios_chrome_info_plist_additions != []) {
         info_plists += ios_chrome_info_plist_additions
       }
+      if (ios_chrome_info_plist_addition_targets != []) {
+        if (!defined(deps)) {
+          deps = []
+        }
+        deps += ios_chrome_info_plist_addition_targets
+      }
       if (defined(invoker.extra_info_plists)) {
         info_plists += invoker.extra_info_plists
       }
@@ -129,6 +135,20 @@ set_defaults("chrome_ios_eg_v2_test_app_host") {
 }
 
 template("chrome_ios_eg2_test") {
+  _deps_group_name = target_name + "_deps_group"
+  group(_deps_group_name) {
+    testonly = true
+
+    public_deps = []
+    if (defined(invoker.deps)) {
+      public_deps += invoker.deps
+    }
+
+    if (defined(invoker.public_deps)) {
+      public_deps += invoker.public_deps
+    }
+  }
+
   assert(defined(invoker.xcode_test_application_name),
          "xcode_test_application_name must be defined for $target_name")
   assert(