Remove //chrome/updater/win:base target.

This target has been sparsely populated and a constant source of
dependency cycles with //chrome/updater:base.

Bug: 1097123
Change-Id: I57048675026ad3df7ce0f0d7c4c97d65e47c72f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2254094Reviewed-by: S. Ganesh <ganesh@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780451}

chrome/updater/BUILD.gn

@@ -30,7 +30,12 @@ group("updater") {
 # Conditional build is needed, otherwise the analyze script on Linux
 # requires all targets and it is going to include the targets below.
 if (is_win || is_mac) {
-  # This target must only have platform-neutral sources.
+  # This target must only have platform-neutral sources. Generally speaking,
+  # these sources are related to common, cross-platfrom aspects of the code,
+  # such as crash handling, or interfaces to cross platform dependencies from
+  # Chromium. If the sources are in platform-specific directories or their
+  # names contain platform-specific suffixes, they must go into the :lib
+  # target, or to targets in their platform directories.
   source_set("base") {
     sources = [
       "action_handler.h",
@@ -71,6 +76,7 @@ if (is_win || is_mac) {
     ]
   }
 
+  # Use this source set for code which has platform-specific modules.
   source_set("lib") {
     sources = [
       "app/app.cc",
@@ -141,8 +147,6 @@ if (is_win || is_mac) {
         "lib_util_win.cc",
         "prefs_win.cc",
         "update_apps_win.cc",
-        "win/group_policy_manager.cc",
-        "win/group_policy_manager.h",
       ]
     }
 
@@ -163,7 +167,6 @@ if (is_win || is_mac) {
     if (is_win) {
       deps += [
         "//chrome/updater/app/server/win:updater_idl_idl",
-        "//chrome/updater/win:base",
         "//chrome/updater/win:constants",
         "//chrome/updater/win:lib",
       ]
@@ -256,7 +259,6 @@ if (is_win || is_mac) {
       sources += [
         "external_constants_win_unittest.cc",
         "test/integration_tests_win.cc",
-        "win/group_policy_manager_unittest.cc",
       ]
 
       deps += [

chrome/updater/test/test_app/BUILD.gn

@@ -80,7 +80,7 @@ source_set("app_sources") {
   if (is_win) {
     deps += [
       "//chrome/updater/app/server/win:updater_idl_idl",
-      "//chrome/updater/win:base",
+      "//chrome/updater/win:lib",
     ]
   }
 }

chrome/updater/win/BUILD.gn

@@ -52,32 +52,6 @@ process_version_rc_template("version_resources") {
   output = "$target_gen_dir/updater_exe.rc"
 }
 
-source_set("base") {
-  sources = [
-    "scoped_handle.h",
-    "task_scheduler.cc",
-    "task_scheduler.h",
-    "user_info.cc",
-    "user_info.h",
-    "util.cc",
-    "util.h",
-  ]
-
-  defines = [ "SECURITY_WIN32" ]
-
-  deps = [
-    ":constants",
-    "//base",
-    "//chrome/updater:base",
-    "//chrome/updater:version_header",
-  ]
-
-  libs = [
-    "secur32.lib",
-    "taskschd.lib",
-  ]
-}
-
 source_set("constants") {
   sources = [
     "constants.cc",
@@ -93,6 +67,8 @@ source_set("constants") {
 source_set("lib") {
   sources = [
     "action_handler.cc",
+    "group_policy_manager.cc",
+    "group_policy_manager.h",
     "net/net_util.cc",
     "net/net_util.h",
     "net/network.h",
@@ -101,27 +77,40 @@ source_set("lib") {
     "net/network_winhttp.cc",
     "net/network_winhttp.h",
     "net/scoped_hinternet.h",
+    "scoped_handle.h",
     "setup/setup.cc",
     "setup/setup.h",
     "setup/setup_util.cc",
     "setup/setup_util.h",
     "setup/uninstall.cc",
     "setup/uninstall.h",
+    "task_scheduler.cc",
+    "task_scheduler.h",
     "update_service_out_of_process.cc",
     "update_service_out_of_process.h",
+    "user_info.cc",
+    "user_info.h",
+    "util.cc",
+    "util.h",
   ]
 
-  libs = [ "winhttp.lib" ]
-
   configs -= [ "//build/config/win:winver" ]
   configs += [ "//chrome/updater/app/server/win:winver" ]
 
+  defines = [ "SECURITY_WIN32" ]
+
+  libs = [
+    "secur32.lib",
+    "taskschd.lib",
+    "winhttp.lib",
+  ]
+
   deps = [
-    ":base",
     ":constants",
     "//base",
     "//chrome/installer/util:with_no_strings",
     "//chrome/updater:base",
+    "//chrome/updater:version_header",
     "//chrome/updater/app/server/win:updater_idl_idl",
     "//components/update_client",
     "//url:url",
@@ -149,7 +138,6 @@ source_set("install_app") {
   ]
 
   deps = [
-    ":base",
     ":install_progress_observer",
     ":lib",
     "//base",
@@ -170,12 +158,12 @@ source_set("updater_tests") {
   testonly = true
 
   sources = [
+    "group_policy_manager_unittest.cc",
     "net/network_unittest.cc",
     "util_unittest.cc",
   ]
 
   deps = [
-    ":base",
     ":constants",
     ":install_app",
     ":lib",
@@ -201,7 +189,6 @@ test("updater_unittests") {
   ]
 
   deps = [
-    ":base",
     ":install_app",
     ":lib",
     "//base",

chrome/updater/win/test/BUILD.gn

@@ -26,8 +26,8 @@ source_set("test_common") {
   deps = [
     "//base",
     "//chrome/updater:base",
-    "//chrome/updater/win:base",
     "//chrome/updater/win:install_app",
+    "//chrome/updater/win:lib",
   ]
 }
 

chrome/updater/win/ui/BUILD.gn

@@ -40,8 +40,8 @@ source_set("ui") {
     "//base",
     "//base:i18n",
     "//chrome/updater:base",
-    "//chrome/updater/win:base",
     "//chrome/updater/win:install_progress_observer",
+    "//chrome/updater/win:lib",
     "//third_party/wtl",
   ]