BASELINE: Update Chromium to 85.0.4183.14085-based

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

10 files changed, 172 insertions, 1 deletions

diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
index efe0a7e20ae..1c8652c3ada 100644
--- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn
@@ -73,6 +73,7 @@ source_set("settings") {
     ":settings_root",
     "resources:app_icon_placeholder",
     "resources:encryption_error",
+    "resources:enterprise_icon",
     "resources:settings_about_chrome",
     "resources:settings_accounts_add_account",
     "resources:settings_addresses",
@@ -82,11 +83,14 @@ source_set("settings") {
     "resources:settings_content_settings",
     "resources:settings_debug",
     "resources:settings_error",
+    "resources:settings_info",
     "resources:settings_language_settings",
     "resources:settings_passwords",
     "resources:settings_payment_methods",
     "resources:settings_privacy",
+    "resources:settings_safe_state",
     "resources:settings_search_engine",
+    "resources:settings_unsafe_state",
     "resources:settings_voice_search",
     "resources:sync_and_google_services",
     "resources:sync_and_google_services_sync_error",
@@ -106,6 +110,7 @@ source_set("settings") {
     "//components/keyed_service/core",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
+    "//components/prefs",
     "//components/prefs/ios",
     "//components/resources",
     "//components/search_engines",
@@ -151,11 +156,13 @@ source_set("settings") {
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/cells:public",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/settings/language:language",
     "//ios/chrome/browser/ui/settings/language:language_ui",
     "//ios/chrome/browser/ui/settings/password",
     "//ios/chrome/browser/ui/settings/privacy",
+    "//ios/chrome/browser/ui/settings/safety_check",
     "//ios/chrome/browser/ui/settings/sync",
     "//ios/chrome/browser/ui/settings/sync/utils",
     "//ios/chrome/browser/ui/settings/utils",
diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
index ed05c753e5b..d21536b39f7 100644
--- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn
@@ -52,6 +52,7 @@ source_set("autofill") {
     "//ios/chrome/browser/ui/settings/autofill/cells",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/credit_card_scanner",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
index 0be2e7306bb..4c8285696b8 100644
--- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -20,6 +20,10 @@ source_set("cells") {
     "settings_image_detail_text_item.mm",
     "settings_multiline_detail_item.h",
     "settings_multiline_detail_item.mm",
+    "settings_password_check_cell.h",
+    "settings_password_check_cell.mm",
+    "settings_password_check_item.h",
+    "settings_password_check_item.mm",
     "settings_switch_cell.h",
     "settings_switch_cell.mm",
     "settings_switch_item.h",
@@ -82,6 +86,7 @@ source_set("unit_tests") {
     "passphrase_error_item_unittest.mm",
     "search_engine_item_unittest.mm",
     "settings_multiline_detail_item_unittest.mm",
+    "settings_password_check_item_unittest.mm",
     "version_item_unittest.mm",
   ]
 
diff --git a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
new file mode 100644
index 00000000000..e0a189a1467
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn
@@ -0,0 +1,26 @@
+# 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.
+
+# import("//build/config/ios/ios_sdk.gni")
+
+source_set("enterprise_info_popover_view_controller") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+
+  sources = [
+    "enterprise_info_popover_view_controller.h",
+    "enterprise_info_popover_view_controller.mm",
+  ]
+
+  libs = [ "UIKit.framework" ]
+
+  deps = [
+    "//base:base",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/common:common",
+    "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
+    "//ios/chrome/common/ui/util",
+    "//ui/base",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
index ea6b65e0497..4be6baa2f2a 100644
--- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn
@@ -109,7 +109,6 @@ source_set("eg_tests") {
     "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/tabs",
-    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/authentication:eg_test_support",
     "//ios/chrome/browser/ui/bookmarks:eg_test_support",
     "//ios/chrome/test/app:test_support",
diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
index fc5883e6fad..9fdc149070a 100644
--- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn
@@ -10,6 +10,9 @@ source_set("password") {
     "password_details_table_view_controller_delegate.h",
     "password_exporter.h",
     "password_exporter.mm",
+    "passwords_consumer.h",
+    "passwords_mediator.h",
+    "passwords_mediator.mm",
     "passwords_table_view_controller.h",
     "passwords_table_view_controller.mm",
   ]
@@ -35,6 +38,7 @@ source_set("password") {
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/settings/cells:public",
+    "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller",
     "//ios/chrome/browser/ui/settings/utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
@@ -45,6 +49,7 @@ source_set("password") {
     "//ios/chrome/common/ui/util",
     "//ios/third_party/material_components_ios",
     "//ui/base",
+    "//ui/base/clipboard:clipboard_types",
     "//url",
   ]
 }
@@ -90,6 +95,7 @@ source_set("unit_tests") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/ui/settings/cells",
     "//ios/chrome/browser/ui/table_view:test_support",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
index 9839e7f195c..db6bd6b97e0 100644
--- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn
@@ -7,6 +7,9 @@ source_set("privacy_ui") {
   sources = [
     "cookies_commands.h",
     "cookies_consumer.h",
+    "cookies_status_consumer.h",
+    "cookies_status_description.h",
+    "cookies_status_description.mm",
     "cookies_view_controller.h",
     "cookies_view_controller.mm",
     "handoff_table_view_controller.h",
@@ -16,6 +19,8 @@ source_set("privacy_ui") {
     "privacy_table_view_controller.mm",
   ]
   deps = [
+    "resources:accessory_checkmark",
+    "resources:accessory_no_checkmark",
     "//base",
     "//components/handoff",
     "//components/prefs",
@@ -42,6 +47,7 @@ source_set("privacy_ui") {
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/table_view/cells:cells_constants",
     "//ios/chrome/common/ui/colors",
+    "//ios/chrome/common/ui/elements:popover_label_view_controller",
     "//ui/base",
   ]
 }
@@ -53,17 +59,29 @@ source_set("privacy") {
     "cookies_coordinator.mm",
     "cookies_mediator.h",
     "cookies_mediator.mm",
+    "cookies_status_mediator.h",
+    "cookies_status_mediator.mm",
     "privacy_coordinator.h",
     "privacy_coordinator.mm",
   ]
   deps = [
     ":privacy_ui",
+    "//components/content_settings/core/browser",
+    "//components/content_settings/core/common",
+    "//components/prefs",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/content_settings",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/settings:settings_root",
     "//ios/chrome/browser/ui/settings/clear_browsing_data",
+    "//ios/chrome/browser/ui/settings/utils",
+    "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view/cells",
+    "//ui/base",
   ]
   libs = [ "UIKit.framework" ]
 }
diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn
new file mode 100644
index 00000000000..6dc98952b58
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn
@@ -0,0 +1,21 @@
+# 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.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("accessory_checkmark") {
+  sources = [
+    "accessory_checkmark.imageset/Contents.json",
+    "accessory_checkmark.imageset/accessory_checkmark@2x.png",
+    "accessory_checkmark.imageset/accessory_checkmark@3x.png",
+  ]
+}
+
+imageset("accessory_no_checkmark") {
+  sources = [
+    "accessory_no_checkmark.imageset/Contents.json",
+    "accessory_no_checkmark.imageset/accessory_no_checkmark@2x.png",
+    "accessory_no_checkmark.imageset/accessory_no_checkmark@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
index e1eea0408e8..3fe05c78784 100644
--- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
+++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn
@@ -26,6 +26,14 @@ imageset("encryption_error") {
   ]
 }
 
+imageset("enterprise_icon") {
+  sources = [
+    "enterprise_icon.imageset/Contents.json",
+    "enterprise_icon.imageset/enterprise_icon@2x.png",
+    "enterprise_icon.imageset/enterprise_icon@3x.png",
+  ]
+}
+
 imageset("settings_accounts_add_account") {
   sources = [
     "settings_accounts_add_account.imageset/Contents.json",
@@ -182,3 +190,27 @@ imageset("sync_and_google_services_sync_on") {
     "sync_and_google_services_sync_on.imageset/sync_and_google_services_sync_on@3x.png",
   ]
 }
+
+imageset("settings_unsafe_state") {
+  sources = [
+    "settings_unsafe_state.imageset/Contents.json",
+    "settings_unsafe_state.imageset/settings_unsafe_state@2x.png",
+    "settings_unsafe_state.imageset/settings_unsafe_state@3x.png",
+  ]
+}
+
+imageset("settings_safe_state") {
+  sources = [
+    "settings_safe_state.imageset/Contents.json",
+    "settings_safe_state.imageset/settings_safe_state@2x.png",
+    "settings_safe_state.imageset/settings_safe_state@3x.png",
+  ]
+}
+
+imageset("settings_info") {
+  sources = [
+    "settings_info.imageset/Contents.json",
+    "settings_info.imageset/settings_info@2x.png",
+    "settings_info.imageset/settings_info@3x.png",
+  ]
+}
diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
new file mode 100644
index 00000000000..d07416fda68
--- /dev/null
+++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn
@@ -0,0 +1,56 @@
+# 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("safety_check_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "safety_check_navigation_commands.h",
+    "safety_check_table_view_controller.h",
+    "safety_check_table_view_controller.mm",
+  ]
+  deps = [
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser/ui:feature_flags",
+    "//ios/chrome/browser/ui/settings:settings_root",
+    "//ios/chrome/browser/ui/table_view",
+    "//ui/base",
+  ]
+}
+
+source_set("safety_check") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "safety_check_coordinator.h",
+    "safety_check_coordinator.mm",
+  ]
+  deps = [
+    ":safety_check_ui",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/ui/settings:settings_root",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
+source_set("unit_tests") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  testonly = true
+  sources = [ "safety_check_table_view_controller_unittest.mm" ]
+  deps = [
+    ":safety_check_ui",
+    "//base/test:test_support",
+    "//components/strings",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser",
+    "//ios/chrome/browser/browser_state:test_support",
+    "//ios/chrome/browser/main:test_support",
+    "//ios/chrome/browser/ui/table_view:test_support",
+    "//ios/chrome/test:test_support",
+    "//ios/web/public/test",
+    "//testing/gtest",
+    "//ui/base",
+  ]
+}