BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 33 insertions, 17 deletions

diff --git a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
index 381fb117c3e..c71a0460400 100644
--- a/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/ios/chrome/browser/safe_browsing/BUILD.gn
@@ -7,6 +7,8 @@ import("//ios/features.gni")
 
 source_set("safe_browsing") {
   sources = [
+    "pending_unsafe_resource_storage.h",
+    "pending_unsafe_resource_storage.mm",
     "safe_browsing_blocking_page.h",
     "safe_browsing_blocking_page.mm",
     "safe_browsing_error.h",
@@ -23,7 +25,6 @@ source_set("safe_browsing") {
   ]
 
   deps = [
-    ":allow_list",
     ":util",
     "//base",
     "//build:branding_buildflags",
@@ -31,10 +32,12 @@ source_set("safe_browsing") {
     "//components/safe_browsing/core:features",
     "//components/safe_browsing/core/browser",
     "//components/safe_browsing/core/common",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
     "//components/safe_browsing/core/db",
     "//components/safe_browsing/core/db:database_manager",
     "//components/safe_browsing/core/db:v4_local_database_manager",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
     "//ios/chrome/browser",
@@ -55,21 +58,6 @@ source_set("safe_browsing") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("allow_list") {
-  sources = [
-    "safe_browsing_url_allow_list.h",
-    "safe_browsing_url_allow_list.mm",
-  ]
-
-  deps = [
-    "//components/safe_browsing/core/db:v4_protocol_manager_util",
-    "//ios/web/public",
-    "//url",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("test_support") {
   testonly = true
   sources = [
@@ -97,16 +85,44 @@ source_set("util") {
   deps = [
     "//base",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core",
     "//components/security_interstitials/core:unsafe_resource",
+    "//ios/web/public",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
+source_set("eg2_tests") {
+  defines = [ "CHROME_EARL_GREY_2" ]
+  configs += [
+    "//build/config/compiler:enable_arc",
+    "//build/config/ios:xctest_config",
+  ]
+  testonly = true
+  sources = [ "safe_browsing_egtest.mm" ]
+  deps = [
+    "//base",
+    "//components/safe_browsing/core:features",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/strings:components_strings_grit",
+    "//ios/chrome/test/earl_grey:eg_test_support+eg2",
+    "//ios/testing/earl_grey:eg_test_support+eg2",
+    "//ios/third_party/earl_grey2:test_lib",
+    "//ios/web/common:features",
+    "//ios/web/public/test:element_selector",
+    "//ios/web/public/test/http_server",
+    "//net:test_support",
+    "//ui/base",
+  ]
+  libs = [ "UIKit.framework" ]
+}
+
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "pending_unsafe_resource_storage_unittest.mm",
     "safe_browsing_blocking_page_unittest.mm",
     "safe_browsing_service_unittest.mm",
     "safe_browsing_tab_helper_unittest.mm",
@@ -116,7 +132,6 @@ source_set("unit_tests") {
   ]
 
   deps = [
-    ":allow_list",
     ":safe_browsing",
     ":test_support",
     "//base/test:test_support",
@@ -133,6 +148,7 @@ source_set("unit_tests") {
     "//components/safe_browsing/core/db:v4_get_hash_protocol_manager",
     "//components/safe_browsing/core/db:v4_protocol_manager_util",
     "//components/safe_browsing/core/db:v4_test_util",
+    "//components/safe_browsing/ios/browser:allow_list",
     "//components/security_interstitials/core:unsafe_resource",
     "//ios/chrome/browser/browser_state:test_support",
     "//ios/chrome/browser/prerender",