BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 62 insertions, 2 deletions

diff --git a/chromium/chrome/browser/safe_browsing/BUILD.gn b/chromium/chrome/browser/safe_browsing/BUILD.gn
index d041bd3f61a..82edacf2604 100644
--- a/chromium/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/chrome/browser/safe_browsing/BUILD.gn
@@ -20,6 +20,7 @@ static_library("safe_browsing") {
     "//chrome/common",
     "//chrome/common:constants",
     "//components/browser_sync",
+    "//components/enterprise/common:strings",
     "//components/keyed_service/content",
     "//components/language/core/browser",
     "//components/page_info",
@@ -242,6 +243,8 @@ static_library("safe_browsing") {
       ]
       deps += [
         ":advanced_protection",
+        ":chrome_enterprise_url_lookup_service",
+        ":chrome_enterprise_url_lookup_service_factory",
         "//chrome/common/safe_browsing:archive_analyzer_results",
         "//chrome/common/safe_browsing:binary_feature_extractor",
         "//chrome/common/safe_browsing:disk_image_type_sniffer_mac",
@@ -263,14 +266,13 @@ static_library("safe_browsing") {
       }
     } else if (safe_browsing_mode == 2) {
       sources += [
-        "android/safe_browsing_bridge.cc",
         "android/services_delegate_android.cc",
         "android/services_delegate_android.h",
         "telemetry/android/android_telemetry_service.cc",
         "telemetry/android/android_telemetry_service.h",
       ]
       deps += [
-        "//chrome/android:jni_headers",
+        "//chrome/browser/safe_browsing/android",
         "//components/safe_browsing:buildflags",
         "//components/safe_browsing/android:safe_browsing_mobile",
       ]
@@ -278,6 +280,36 @@ static_library("safe_browsing") {
   }
 }
 
+source_set("chrome_enterprise_url_lookup_service_factory") {
+  sources = [
+    "chrome_enterprise_url_lookup_service_factory.cc",
+    "chrome_enterprise_url_lookup_service_factory.h",
+  ]
+
+  deps = [
+    ":chrome_enterprise_url_lookup_service",
+    ":verdict_cache_manager_factory",
+    "//chrome/common",
+    "//components/keyed_service/content",
+    "//content/public/browser",
+  ]
+}
+
+source_set("chrome_enterprise_url_lookup_service") {
+  sources = [
+    "chrome_enterprise_url_lookup_service.cc",
+    "chrome_enterprise_url_lookup_service.h",
+  ]
+
+  deps = [
+    "//components/safe_browsing/core:realtimeapi_proto",
+    "//components/safe_browsing/core:verdict_cache_manager",
+    "//components/safe_browsing/core/realtime:policy_engine",
+    "//components/safe_browsing/core/realtime:url_lookup_service_base",
+    "//services/network/public/cpp:cpp",
+  ]
+}
+
 source_set("url_lookup_service_factory") {
   sources = [
     "url_lookup_service_factory.cc",
diff --git a/chromium/chrome/browser/safe_browsing/android/BUILD.gn b/chromium/chrome/browser/safe_browsing/android/BUILD.gn
new file mode 100644
index 00000000000..e6473eafd3b
--- /dev/null
+++ b/chromium/chrome/browser/safe_browsing/android/BUILD.gn
@@ -0,0 +1,28 @@
+# 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/android/rules.gni")
+
+generate_jni("jni_headers") {
+  sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java" ]
+}
+
+source_set("android") {
+  sources = [ "safe_browsing_bridge.cc" ]
+  deps = [
+    ":jni_headers",
+    "//components/prefs",
+    "//components/safe_browsing/core:file_type_policies",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
+  ]
+}
+
+android_library("java") {
+  sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java" ]
+  deps = [
+    "//base:base_java",
+    "//base:jni_java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}