BASELINE: Update Chromium to 85.0.4183.14085-based

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

7 files changed, 222 insertions, 0 deletions

diff --git a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
index 1eaea91c930..3272002eb84 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/BUILD.gn
@@ -9,6 +9,8 @@ source_set("overlays") {
     "infobar_banner_overlay_request_cancel_handler.mm",
     "infobar_modal_completion_notifier.h",
     "infobar_modal_completion_notifier.mm",
+    "infobar_modal_overlay_request_cancel_handler.h",
+    "infobar_modal_overlay_request_cancel_handler.mm",
     "infobar_overlay_request_cancel_handler.h",
     "infobar_overlay_request_cancel_handler.mm",
     "infobar_overlay_request_factory.h",
@@ -20,6 +22,8 @@ source_set("overlays") {
     "infobar_overlay_tab_helper.mm",
     "translate_infobar_placeholder_overlay_request_cancel_handler.h",
     "translate_infobar_placeholder_overlay_request_cancel_handler.mm",
+    "translate_overlay_tab_helper.h",
+    "translate_overlay_tab_helper.mm",
   ]
   public_deps = [ ":overlay_type" ]
   deps = [
@@ -66,6 +70,8 @@ source_set("test_support") {
   sources = [
     "fake_infobar_overlay_request_factory.h",
     "fake_infobar_overlay_request_factory.mm",
+    "fake_translate_overlay_tab_helper.h",
+    "fake_translate_overlay_tab_helper.mm",
   ]
   deps = [
     ":overlays",
@@ -82,12 +88,14 @@ source_set("unit_tests") {
   sources = [
     "infobar_banner_overlay_request_cancel_handler_unittest.mm",
     "infobar_modal_completion_notifier_unittest.mm",
+    "infobar_modal_overlay_request_cancel_handler_unittest.mm",
     "infobar_overlay_request_cancel_handler_unittest.mm",
     "infobar_overlay_request_factory_impl_unittest.mm",
     "infobar_overlay_request_inserter_unittest.mm",
     "infobar_overlay_tab_helper_unittest.mm",
     "infobar_overlay_util_unittest.mm",
     "translate_infobar_placeholder_overlay_request_cancel_handler_unittest.mm",
+    "translate_overlay_tab_helper_unittest.mm",
   ]
   deps = [
     ":overlays",
@@ -102,6 +110,7 @@ source_set("unit_tests") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/main:test_support",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common",
     "//ios/chrome/browser/overlays/public/common/infobars",
@@ -110,9 +119,12 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/test",
     "//ios/chrome/browser/passwords:infobar_delegates",
     "//ios/chrome/browser/passwords/test",
+    "//ios/chrome/browser/translate:test_support",
     "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/web_state_list",
     "//ios/chrome/test:test_support",
+    "//ios/web/public/test",
     "//ios/web/public/test/fakes",
     "//testing/gtest",
   ]
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
index f6c25a75476..6c9e836dbb9 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/BUILD.gn
@@ -30,7 +30,10 @@ source_set("browser_agent_util") {
   deps = [
     ":browser_agent",
     "//base",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/passwords",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/ui/infobars:feature_flags",
   ]
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
index cb01bbd46bd..fa16ba157bb 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/BUILD.gn
@@ -16,6 +16,8 @@ source_set("common") {
   ]
   deps = [
     "//base",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/infobars/overlays:util",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
     "//ios/chrome/browser/overlays",
@@ -29,6 +31,7 @@ source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
   sources = [
+    "infobar_banner_interaction_handler_unittest.mm",
     "infobar_banner_overlay_request_callback_installer_unittest.mm",
     "infobar_modal_overlay_request_callback_installer_unittest.mm",
   ]
@@ -38,6 +41,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common/test",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
     "//ios/chrome/browser/infobars/test",
@@ -48,6 +53,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays/public/infobar_banner",
     "//ios/chrome/browser/overlays/public/infobar_modal",
     "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/passwords/test",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/web_state_list:test_support",
     "//ios/chrome/test:test_support",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn
new file mode 100644
index 00000000000..bc0ce8f9e88
--- /dev/null
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/confirm/BUILD.gn
@@ -0,0 +1,47 @@
+# Copyright 2020 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.
+
+source_set("confirm") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "confirm_infobar_banner_interaction_handler.h",
+    "confirm_infobar_banner_interaction_handler.mm",
+    "confirm_infobar_interaction_handler.h",
+    "confirm_infobar_interaction_handler.mm",
+  ]
+  deps = [
+    "//base",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/commands",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "confirm_infobar_banner_interaction_handler_unittest.mm" ]
+  deps = [
+    ":confirm",
+    "//base/test:test_support",
+    "//components/infobars/core:feature_flags",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card/BUILD.gn
new file mode 100644
index 00000000000..65a387ce7a4
--- /dev/null
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card/BUILD.gn
@@ -0,0 +1,70 @@
+# Copyright 2020 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.
+
+source_set("save_card") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "save_card_infobar_banner_interaction_handler.h",
+    "save_card_infobar_banner_interaction_handler.mm",
+    "save_card_infobar_banner_overlay_request_callback_installer.h",
+    "save_card_infobar_banner_overlay_request_callback_installer.mm",
+    "save_card_infobar_interaction_handler.h",
+    "save_card_infobar_interaction_handler.mm",
+    "save_card_infobar_modal_interaction_handler.h",
+    "save_card_infobar_modal_interaction_handler.mm",
+    "save_card_infobar_modal_overlay_request_callback_installer.h",
+    "save_card_infobar_modal_overlay_request_callback_installer.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/autofill/core/browser",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/web_state_list",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "save_card_infobar_banner_interaction_handler_unittest.mm",
+    "save_card_infobar_banner_overlay_request_callback_installer_unittest.mm",
+    "save_card_infobar_modal_interaction_handler_unittest.mm",
+    "save_card_infobar_modal_overlay_request_callback_installer_unittest.mm",
+  ]
+  deps = [
+    ":save_card",
+    "//base/test:test_support",
+    "//components/autofill/core/browser:test_support",
+    "//components/infobars/core:feature_flags",
+    "//components/prefs",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars:infobars_ui",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn
index dd9040c54ce..cca2b0ddd2e 100644
--- a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test/BUILD.gn
@@ -5,17 +5,30 @@
 source_set("test") {
   testonly = true
   sources = [
+    "mock_autofill_save_card_infobar_delegate_mobile.h",
+    "mock_autofill_save_card_infobar_delegate_mobile.mm",
     "mock_infobar_interaction_handler.h",
     "mock_infobar_interaction_handler.mm",
+    "mock_save_card_banner_infobar_interaction_handler.h",
+    "mock_save_card_banner_infobar_interaction_handler.mm",
+    "mock_save_card_modal_infobar_interaction_handler.h",
+    "mock_save_card_modal_infobar_interaction_handler.mm",
+    "mock_translate_infobar_interaction_handler.h",
+    "mock_translate_infobar_interaction_handler.mm",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
     "//base",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/browser:test_support",
+    "//components/prefs",
     "//ios/chrome/browser/infobars:public",
     "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/save_card",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common/infobars",
     "//ios/chrome/browser/overlays/public/infobar_banner",
diff --git a/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate/BUILD.gn b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate/BUILD.gn
new file mode 100644
index 00000000000..06075ba9e35
--- /dev/null
+++ b/chromium/ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/translate/BUILD.gn
@@ -0,0 +1,70 @@
+# Copyright 2020 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.
+
+source_set("translate") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "translate_infobar_banner_interaction_handler.h",
+    "translate_infobar_banner_interaction_handler.mm",
+    "translate_infobar_interaction_handler.h",
+    "translate_infobar_interaction_handler.mm",
+    "translate_infobar_modal_interaction_handler.h",
+    "translate_infobar_modal_interaction_handler.mm",
+    "translate_infobar_modal_overlay_request_callback_installer.h",
+    "translate_infobar_modal_overlay_request_callback_installer.mm",
+  ]
+  deps = [
+    "//base",
+    "//components/metrics",
+    "//components/strings:components_strings_grit",
+    "//components/translate/core/browser",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers:interaction_handlers",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/translate:public",
+    "//ios/chrome/browser/web_state_list",
+  ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [
+    "translate_infobar_banner_interaction_handler_unittest.mm",
+    "translate_infobar_modal_interaction_handler_unittest.mm",
+    "translate_infobar_modal_overlay_request_callback_installer_unittest.mm",
+  ]
+  deps = [
+    ":translate",
+    "//base/test:test_support",
+    "//components/infobars/core:feature_flags",
+    "//components/translate/core/browser:test_support",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/overlays",
+    "//ios/chrome/browser/infobars/overlays:util",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/common",
+    "//ios/chrome/browser/infobars/overlays/browser_agent/interaction_handlers/test",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/translate:test_support",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars:infobars_ui",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/web_state_list",
+    "//ios/web/public/test/fakes",
+    "//testing/gtest",
+  ]
+}