BASELINE: Update Chromium to 76.0.3809.94

Change-Id: I321c3f5f929c105aec0f98c5091ef6108822e647
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 98 insertions, 58 deletions

diff --git a/chromium/chrome/browser/safe_browsing/BUILD.gn b/chromium/chrome/browser/safe_browsing/BUILD.gn
index b7a963c2cab..cc98a0bf4f1 100644
--- a/chromium/chrome/browser/safe_browsing/BUILD.gn
+++ b/chromium/chrome/browser/safe_browsing/BUILD.gn
@@ -21,8 +21,6 @@ jumbo_static_library("safe_browsing") {
     "//chrome/common:constants",
     "//chrome/common/safe_browsing:file_type_policies",
     "//components/browser_sync",
-    "//components/chrome_cleaner/public/interfaces",
-    "//components/data_use_measurement/core",
     "//components/keyed_service/content",
     "//components/language/core/browser",
     "//components/password_manager/core/browser",
@@ -47,35 +45,6 @@ jumbo_static_library("safe_browsing") {
 
   if (enable_extensions) {
     sources += [
-      "chrome_cleaner/chrome_cleaner_controller_impl_win.cc",
-      "chrome_cleaner/chrome_cleaner_controller_impl_win.h",
-      "chrome_cleaner/chrome_cleaner_controller_win.cc",
-      "chrome_cleaner/chrome_cleaner_controller_win.h",
-      "chrome_cleaner/chrome_cleaner_dialog_controller_impl_win.cc",
-      "chrome_cleaner/chrome_cleaner_dialog_controller_impl_win.h",
-      "chrome_cleaner/chrome_cleaner_dialog_controller_win.h",
-      "chrome_cleaner/chrome_cleaner_extensions_util_win.h",
-      "chrome_cleaner/chrome_cleaner_fetcher_win.cc",
-      "chrome_cleaner/chrome_cleaner_fetcher_win.h",
-      "chrome_cleaner/chrome_cleaner_navigation_util_win.cc",
-      "chrome_cleaner/chrome_cleaner_navigation_util_win.h",
-      "chrome_cleaner/chrome_cleaner_reboot_dialog_controller_impl_win.cc",
-      "chrome_cleaner/chrome_cleaner_reboot_dialog_controller_impl_win.h",
-      "chrome_cleaner/chrome_cleaner_reboot_dialog_controller_win.h",
-      "chrome_cleaner/chrome_cleaner_runner_win.cc",
-      "chrome_cleaner/chrome_cleaner_runner_win.h",
-      "chrome_cleaner/chrome_cleaner_scanner_results_win.cc",
-      "chrome_cleaner/chrome_cleaner_scanner_results_win.h",
-      "chrome_cleaner/reporter_runner_win.cc",
-      "chrome_cleaner/reporter_runner_win.h",
-      "chrome_cleaner/settings_resetter_win.cc",
-      "chrome_cleaner/settings_resetter_win.h",
-      "chrome_cleaner/srt_chrome_prompt_impl_win.cc",
-      "chrome_cleaner/srt_chrome_prompt_impl_win.h",
-      "chrome_cleaner/srt_client_info_win.cc",
-      "chrome_cleaner/srt_client_info_win.h",
-      "chrome_cleaner/srt_field_trial_win.cc",
-      "chrome_cleaner/srt_field_trial_win.h",
       "settings_reset_prompt/default_settings_fetcher.cc",
       "settings_reset_prompt/default_settings_fetcher.h",
       "settings_reset_prompt/settings_reset_prompt_config.cc",
@@ -89,16 +58,7 @@ jumbo_static_library("safe_browsing") {
       "settings_reset_prompt/settings_reset_prompt_util_win.cc",
       "settings_reset_prompt/settings_reset_prompt_util_win.h",
     ]
-    deps += [
-      "//components/keep_alive_registry",
-      "//extensions/browser",
-    ]
-  }
-
-  if (is_chrome_branded && is_win) {
-    sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win.cc" ]
-  } else {
-    sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ]
+    deps += [ "//extensions/browser" ]
   }
 
   if (safe_browsing_mode != 0) {
@@ -135,16 +95,16 @@ jumbo_static_library("safe_browsing") {
       "//chrome/common/safe_browsing:proto",
       "//components/safe_browsing:csd_proto",
       "//components/safe_browsing:safe_browsing",
-      "//components/safe_browsing/browser:browser",
-      "//components/safe_browsing/common:common",
+      "//components/safe_browsing/browser",
+      "//components/safe_browsing/common",
       "//components/safe_browsing/common:safe_browsing_prefs",
       "//components/safe_browsing/db:metadata_proto",
       "//components/safe_browsing/db:whitelist_checker_client",
       "//components/safe_browsing/password_protection",
+      "//components/safe_browsing/triggers",
       "//components/safe_browsing/triggers:ad_sampler_trigger",
       "//components/safe_browsing/triggers:suspicious_site_trigger",
       "//components/safe_browsing/triggers:trigger_throttler",
-      "//components/safe_browsing/triggers:triggers",
     ]
     if (safe_browsing_mode == 1) {
       # "Safe Browsing Full" files in addition to the "basic" ones to use for
@@ -245,14 +205,14 @@ jumbo_static_library("safe_browsing") {
         "//chrome/common/safe_browsing:disk_image_type_sniffer_mac",
         "//chrome/common/safe_browsing:download_type_util",
         "//chrome/services/file_util/public/cpp",
-        "//components/content_settings/core/browser:browser",
-        "//components/language/core/common:common",
-        "//components/prefs:prefs",
-        "//components/safe_browsing/db:db",
+        "//components/content_settings/core/browser",
+        "//components/language/core/common",
+        "//components/prefs",
+        "//components/safe_browsing/db",
         "//components/security_interstitials/content:security_interstitial_page",
-        "//components/signin/core/browser:browser",
-        "//content/public/browser:browser",
-        "//net:net",
+        "//components/signin/core/browser",
+        "//content/public/browser",
+        "//net",
       ]
       if (is_win) {
         deps += [ "//chrome/browser/safe_browsing/incident_reporting:state_store_data_proto" ]
@@ -261,22 +221,30 @@ jumbo_static_library("safe_browsing") {
       sources += [
         "../loader/safe_browsing_resource_throttle.cc",
         "../loader/safe_browsing_resource_throttle.h",
+        "android/file_type_policies.cc",
         "android/services_delegate_android.cc",
         "android/services_delegate_android.h",
         "telemetry/android/android_telemetry_service.cc",
         "telemetry/android/android_telemetry_service.h",
       ]
-      deps += [ "//components/safe_browsing/android:safe_browsing_mobile" ]
+      deps += [
+        "//chrome/android:jni_headers",
+        "//components/safe_browsing/android:safe_browsing_mobile",
+      ]
     } else if (safe_browsing_mode == 3) {
       sources += [
         "../loader/safe_browsing_resource_throttle.cc",
         "../loader/safe_browsing_resource_throttle.h",
+        "android/file_type_policies.cc",
         "android/services_delegate_android.cc",
         "android/services_delegate_android.h",
         "telemetry/android/android_telemetry_service.cc",
         "telemetry/android/android_telemetry_service.h",
       ]
-      deps += [ "//components/safe_browsing/db:db" ]
+      deps += [
+        "//chrome/android:jni_headers",
+        "//components/safe_browsing/db:db",
+      ]
     }
   }
 }
@@ -291,11 +259,11 @@ static_library("advanced_protection") {
 
   deps = [
     "//components/keyed_service/content",
-    "//components/prefs:prefs",
-    "//components/safe_browsing/common:common",
+    "//components/prefs",
+    "//components/safe_browsing/common",
     "//components/safe_browsing/common:safe_browsing_prefs",
-    "//components/signin/core/browser:browser",
-    "//content/public/browser:browser",
+    "//components/signin/core/browser",
+    "//content/public/browser",
     "//services/identity/public/cpp",
   ]
 }
@@ -313,7 +281,7 @@ source_set("test_support") {
       "//components/safe_browsing/db:database_manager",
       "//components/safe_browsing/db:test_database_manager",
       "//components/safe_browsing/db:v4_protocol_manager_util",
-      "//content/public/browser:browser",
+      "//content/public/browser",
     ]
   }
 }
diff --git a/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn b/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
new file mode 100644
index 00000000000..7b7d767ce54
--- /dev/null
+++ b/chromium/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
@@ -0,0 +1,72 @@
+# 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.
+
+import("//build/config/jumbo.gni")
+
+source_set("public") {
+  sources = [
+    "chrome_cleaner_controller_win.cc",
+    "chrome_cleaner_controller_win.h",
+    "chrome_cleaner_dialog_controller_win.h",
+    "chrome_cleaner_reboot_dialog_controller_win.h",
+    "chrome_cleaner_scanner_results_win.cc",
+    "chrome_cleaner_scanner_results_win.h",
+    "srt_field_trial_win.cc",
+    "srt_field_trial_win.h",
+    "sw_reporter_invocation_win.cc",
+    "sw_reporter_invocation_win.h",
+  ]
+
+  deps = [
+    "//base",
+    "//components/chrome_cleaner/public/constants",
+    "//components/chrome_cleaner/public/interfaces",
+    "//components/variations",
+    "//url",
+  ]
+}
+
+jumbo_static_library("chrome_cleaner") {
+  sources = [
+    "chrome_cleaner_controller_impl_win.cc",
+    "chrome_cleaner_controller_impl_win.h",
+    "chrome_cleaner_dialog_controller_impl_win.cc",
+    "chrome_cleaner_dialog_controller_impl_win.h",
+    "chrome_cleaner_fetcher_win.cc",
+    "chrome_cleaner_fetcher_win.h",
+    "chrome_cleaner_navigation_util_win.cc",
+    "chrome_cleaner_navigation_util_win.h",
+    "chrome_cleaner_reboot_dialog_controller_impl_win.cc",
+    "chrome_cleaner_reboot_dialog_controller_impl_win.h",
+    "chrome_cleaner_runner_win.cc",
+    "chrome_cleaner_runner_win.h",
+    "reporter_runner_win.cc",
+    "reporter_runner_win.h",
+    "settings_resetter_win.cc",
+    "settings_resetter_win.h",
+    "srt_chrome_prompt_impl_win.cc",
+    "srt_chrome_prompt_impl_win.h",
+    "srt_client_info_win.cc",
+    "srt_client_info_win.h",
+  ]
+
+  deps = [
+    # TODO(crbug.com/920223): Break dependency cycles with //chrome/browser
+    ":public",
+    "//chrome/browser/extensions",
+    "//chrome/browser/safe_browsing",
+    "//chrome/browser/ui",
+    "//chrome/common",
+    "//chrome/installer/util:with_no_strings",
+    "//components/chrome_cleaner/public/constants",
+    "//components/chrome_cleaner/public/interfaces",
+    "//components/component_updater",
+    "//components/crx_file",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/safe_browsing/common:safe_browsing_prefs",
+    "//content/public/browser",
+    "//extensions/browser",
+  ]
+}