Add missing deps to safe_browsing/chrome_cleaner

Move safe_browsing/chrome_cleaner into its own target. Add deps to
//chrome/browser/extensions and //chrome/browser/ui to that target.

Rename chrome_cleaner_types target to chrome_cleaner/public.

Bug: 920223
Change-Id: I95dd33b5e7ecb9881436169861d4186506e942fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1625325Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@google.com>
Cr-Commit-Position: refs/heads/master@{#664408}

chrome/browser/BUILD.gn

@@ -3597,6 +3597,8 @@ jumbo_split_static_library("browser") {
     deps += [
       ":chrome_process_finder",
       "//chrome:file_pre_reader",
+      "//chrome/browser/safe_browsing/chrome_cleaner",
+      "//chrome/browser/safe_browsing/chrome_cleaner:public",
       "//chrome/browser/win/conflicts:module_info",
       "//chrome/chrome_elf:blacklist",
       "//chrome/chrome_elf:constants",
@@ -3621,6 +3623,8 @@ jumbo_split_static_library("browser") {
       "//ui/aura_extra",
       "//ui/base:fullscreen_win",
     ]
+    allow_circular_includes_from +=
+        [ "//chrome/browser/safe_browsing/chrome_cleaner" ]
 
     all_dependent_configs = [ ":browser_win_linker_flags" ]
 

chrome/browser/safe_browsing/BUILD.gn

@@ -21,7 +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/keyed_service/content",
     "//components/language/core/browser",
     "//components/password_manager/core/browser",
@@ -46,27 +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_dialog_controller_impl_win.cc",
-      "chrome_cleaner/chrome_cleaner_dialog_controller_impl_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_runner_win.cc",
-      "chrome_cleaner/chrome_cleaner_runner_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",
       "settings_reset_prompt/default_settings_fetcher.cc",
       "settings_reset_prompt/default_settings_fetcher.h",
       "settings_reset_prompt/settings_reset_prompt_config.cc",
@@ -80,11 +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 += [
-      ":chrome_cleaner_types",
-      "//components/keep_alive_registry",
-      "//extensions/browser",
-    ]
+    deps += [ "//extensions/browser" ]
   }
 
   if (safe_browsing_mode != 0) {
@@ -294,29 +268,6 @@ static_library("advanced_protection") {
   ]
 }
 
-source_set("chrome_cleaner_types") {
-  sources = [
-    "chrome_cleaner/chrome_cleaner_controller_win.cc",
-    "chrome_cleaner/chrome_cleaner_controller_win.h",
-    "chrome_cleaner/chrome_cleaner_dialog_controller_win.h",
-    "chrome_cleaner/chrome_cleaner_reboot_dialog_controller_win.h",
-    "chrome_cleaner/chrome_cleaner_scanner_results_win.cc",
-    "chrome_cleaner/chrome_cleaner_scanner_results_win.h",
-    "chrome_cleaner/srt_field_trial_win.cc",
-    "chrome_cleaner/srt_field_trial_win.h",
-    "chrome_cleaner/sw_reporter_invocation_win.cc",
-    "chrome_cleaner/sw_reporter_invocation_win.h",
-  ]
-
-  deps = [
-    "//base",
-    "//components/chrome_cleaner/public/constants",
-    "//components/chrome_cleaner/public/interfaces",
-    "//components/variations",
-    "//url",
-  ]
-}
-
 source_set("test_support") {
   if (safe_browsing_mode != 0) {
     sources = [

chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn

+# 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",
+  ]
+}

chrome/browser/ui/BUILD.gn

@@ -2295,7 +2295,7 @@ jumbo_split_static_library("ui") {
       "//ui/views/controls/webview",
     ]
     deps += [
-      "//chrome/browser/safe_browsing:chrome_cleaner_types",
+      "//chrome/browser/safe_browsing/chrome_cleaner:public",
       "//chrome/browser/win/conflicts:module_info",
       "//chrome/credential_provider/common:common_constants",
       "//components/search_engines",