BASELINE: Update Chromium to 85.0.4183.14085-based

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

6 files changed, 263 insertions, 2 deletions

diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
index e7b023eb62d..8785f23ca15 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn
@@ -8,7 +8,10 @@ source_set("infobar_banner") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
-  deps = [ ":coordinators" ]
+  deps = [
+    ":coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/translate:coordinators",
+  ]
 }
 
 source_set("coordinators") {
@@ -31,6 +34,8 @@ source_set("coordinators") {
     "//ios/chrome/browser/ui/overlays:util",
     "//ios/chrome/browser/ui/overlays/infobar_banner/confirm",
     "//ios/chrome/browser/ui/overlays/infobar_banner/passwords",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/save_card",
+    "//ios/chrome/browser/ui/overlays/infobar_banner/translate:mediators",
     "//ios/chrome/browser/ui/util",
   ]
 }
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
new file mode 100644
index 00000000000..69c920fa654
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn
@@ -0,0 +1,54 @@
+# 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.
+
+source_set("save_card") {
+  sources = [
+    "save_card_infobar_banner_overlay_mediator.h",
+    "save_card_infobar_banner_overlay_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/infobars/banners",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "save_card_infobar_banner_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":save_card",
+    "//base/test:test_support",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/browser:test_support",
+    "//components/infobars/core",
+    "//components/prefs",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//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/banners/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
new file mode 100644
index 00000000000..d50f62b454c
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn
@@ -0,0 +1,69 @@
+# 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.
+
+source_set("coordinators") {
+  sources = [
+    "translate_infobar_placeholder_overlay_coordinator.h",
+    "translate_infobar_placeholder_overlay_coordinator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:coordinators",
+  ]
+}
+
+source_set("mediators") {
+  sources = [
+    "translate_infobar_banner_overlay_mediator.h",
+    "translate_infobar_banner_overlay_mediator.mm",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/ui/infobars/banners",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_banner:mediators",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "translate_infobar_banner_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":mediators",
+    "//base/test:test_support",
+    "//components/infobars/core",
+    "//components/strings:components_strings_grit",
+    "//components/translate/core/browser:test_support",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_banner",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/translate:test_support",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars/banners/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn
index 3088738bf32..d7feb936026 100644
--- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn
@@ -8,7 +8,11 @@ source_set("infobar_modal") {
 
   configs += [ "//build/config/compiler:enable_arc" ]
 
-  deps = [ "//ios/chrome/browser/ui/overlays/infobar_modal/passwords" ]
+  deps = [
+    "//ios/chrome/browser/ui/overlays/infobar_modal/passwords",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/save_card",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/translate",
+  ]
 }
 
 source_set("coordinators") {
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn
new file mode 100644
index 00000000000..802a94a1271
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn
@@ -0,0 +1,64 @@
+# 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") {
+  sources = [
+    "save_card_infobar_modal_overlay_coordinator.h",
+    "save_card_infobar_modal_overlay_coordinator.mm",
+    "save_card_infobar_modal_overlay_mediator.h",
+    "save_card_infobar_modal_overlay_mediator.mm",
+    "save_card_infobar_modal_overlay_mediator_delegate.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/autofill/core/common",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/ui/autofill:autofill_message",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:mediators",
+    "//ios/chrome/browser/ui/util",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "save_card_infobar_modal_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base/test:test_support",
+    "//components/autofill/core/browser",
+    "//components/autofill/core/browser:test_support",
+    "//components/infobars/core",
+    "//components/infobars/core:feature_flags",
+    "//components/prefs",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/overlays/test",
+    "//ios/chrome/browser/ui/autofill:autofill_message",
+    "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/infobars/modals/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays/infobar_modal/save_card",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+    "//url",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn
new file mode 100644
index 00000000000..726e1c90d04
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn
@@ -0,0 +1,65 @@
+# 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") {
+  sources = [
+    "translate_infobar_modal_overlay_coordinator.h",
+    "translate_infobar_modal_overlay_coordinator.mm",
+    "translate_infobar_modal_overlay_mediator.h",
+    "translate_infobar_modal_overlay_mediator.mm",
+    "translate_infobar_modal_overlay_mediator_delegate.h",
+  ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    "//base",
+    "//components/metrics",
+    "//components/translate/core/browser",
+    "//ios/chrome/app/strings:ios_strings_grit",
+    "//ios/chrome/browser/infobars:public",
+    "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/overlays/public/infobar_modal",
+    "//ios/chrome/browser/translate:public",
+    "//ios/chrome/browser/ui/infobars/coordinators:translate_public",
+    "//ios/chrome/browser/ui/infobars/modals",
+    "//ios/chrome/browser/ui/list_model",
+    "//ios/chrome/browser/ui/overlays:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators",
+    "//ios/chrome/browser/ui/overlays/infobar_modal:mediators",
+    "//ios/chrome/browser/ui/table_view/cells",
+    "//ui/base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "translate_infobar_modal_overlay_mediator_unittest.mm" ]
+
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  deps = [
+    ":translate",
+    "//base/test:test_support",
+    "//components/infobars/core",
+    "//components/infobars/core:feature_flags",
+    "//components/translate/core/browser:test_support",
+    "//ios/chrome/browser/infobars",
+    "//ios/chrome/browser/infobars/test",
+    "//ios/chrome/browser/overlays",
+    "//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/coordinators:translate_public",
+    "//ios/chrome/browser/ui/infobars/modals/test",
+    "//ios/chrome/browser/ui/infobars/test",
+    "//ios/chrome/browser/ui/overlays/test",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/ocmock",
+    "//ui/base",
+  ]
+}