Break up updater:common into updater:base and updater:lib.

This allows reducing coupling and eliminating a circular include
in the Windows dependencies.

Rename updater_constants to constants.

Bug: 1054696
Change-Id: I4d6749c14191a9684ecdba364cb127a0a4af00a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2068654
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743728}

chrome/updater/BUILD.gn

@@ -28,11 +28,11 @@ 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) {
-  source_set("common") {
+  source_set("base") {
     sources = [
       "action_handler.h",
-      "configurator.cc",
-      "configurator.h",
+      "constants.cc",
+      "constants.h",
       "crash_client.cc",
       "crash_client.h",
       "crash_reporter.cc",
@@ -48,54 +48,59 @@ if (is_win || is_mac) {
       "registration_data.h",
       "unzipper.cc",
       "unzipper.h",
+      "update_service.h",
+      "util.cc",
+      "util.h",
+    ]
+
+    deps = [
+      ":version_header",
+      "//base",
+      "//components/crx_file",
+      "//components/prefs",
+      "//components/update_client",
+      "//courgette:bsdiff",
+      "//courgette:courgette_lib",
+      "//third_party/crashpad/crashpad/client",
+      "//third_party/crashpad/crashpad/handler",
+      "//third_party/zlib/google:zip",
+      "//url",
+    ]
+  }
+
+  source_set("lib") {
+    sources = [
+      "configurator.cc",
+      "configurator.h",
       "update_apps.cc",
       "update_apps.h",
       "update_service_in_process.cc",
       "update_service_in_process.h",
       "updater.cc",
       "updater.h",
-      "updater_constants.cc",
-      "updater_constants.h",
-      "util.cc",
-      "util.h",
     ]
 
     deps = [
-      ":update_service",
+      ":base",
       ":version_header",
       "//base",
       "//chrome/updater/server",
       "//components/crash/core/common:crash_key",
-      "//components/crx_file",
       "//components/prefs",
       "//components/update_client",
       "//components/version_info",
-      "//courgette:bsdiff",
-      "//courgette:courgette_lib",
-      "//third_party/crashpad/crashpad/client",
-      "//third_party/crashpad/crashpad/handler",
-      "//third_party/zlib/google:zip",
       "//url",
     ]
 
     if (is_win) {
-      deps += [ "//chrome/updater/server/win" ]
+      deps += [ "//chrome/updater/win:lib" ]
     }
 
     if (is_mac) {
-      deps += [
-        "//chrome/updater/mac:network_fetcher_sources",
-        "//chrome/updater/server/mac",
-      ]
+      deps += [ "//chrome/updater/mac:network_fetcher_sources" ]
     }
   }
 
-  source_set("update_service") {
-    sources = [ "update_service.h" ]
-
-    deps = [ "//base" ]
-  }
-
   process_version("version_header") {
     sources = [ "//chrome/VERSION" ]
 
@@ -125,7 +130,7 @@ if (is_win || is_mac) {
     ]
 
     deps = [
-      ":common",
+      ":lib",
       ":updater",
       ":version_header",
       "//base",

chrome/updater/configurator.cc

@@ -7,10 +7,10 @@
 #include <utility>
 #include "base/version.h"
 #include "build/build_config.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/patcher.h"
 #include "chrome/updater/prefs.h"
 #include "chrome/updater/unzipper.h"
-#include "chrome/updater/updater_constants.h"
 #include "components/prefs/pref_service.h"
 #include "components/update_client/network.h"
 #include "components/update_client/patcher.h"

chrome/updater/updater_constants.cc → chrome/updater/constants.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 
 namespace updater {
 

chrome/updater/updater_constants.h → chrome/updater/constants.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_UPDATER_UPDATER_CONSTANTS_H_
-#define CHROME_UPDATER_UPDATER_CONSTANTS_H_
+#ifndef CHROME_UPDATER_CONSTANTS_H_
+#define CHROME_UPDATER_CONSTANTS_H_
 
 #include "components/update_client/update_client_errors.h"
 
@@ -127,4 +127,4 @@ constexpr int kErrorApplicationInstallerFailed = kCustomInstallErrorBase + 3;
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_UPDATER_CONSTANTS_H_
+#endif  // CHROME_UPDATER_CONSTANTS_H_

chrome/updater/crash_reporter.cc

@@ -17,7 +17,7 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/updater_version.h"
 #include "chrome/updater/util.h"
 #include "third_party/crashpad/crashpad/client/crashpad_client.h"

chrome/updater/installer.cc

@@ -14,7 +14,7 @@
 #include "base/threading/scoped_blocking_call.h"
 #include "build/build_config.h"
 #include "chrome/updater/action_handler.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/util.h"
 #include "components/crx_file/crx_verifier.h"
 #include "components/update_client/update_client_errors.h"

chrome/updater/installer_win.cc

@@ -10,7 +10,7 @@
 #include "base/strings/strcat.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 
 namespace updater {
 

chrome/updater/mac/BUILD.gn

@@ -51,7 +51,7 @@ mac_app_bundle("updater_bundle") {
   deps = [
     ":network_fetcher_sources",
     ":updater_setup_sources",
-    "//chrome/updater:common",
+    "//chrome/updater:lib",
   ]
 }
 
@@ -65,13 +65,13 @@ source_set("updater_setup_sources") {
     ":network_fetcher_sources",
     "//base",
     "//chrome/common/mac:launchd",
-    "//chrome/updater:common",
+    "//chrome/updater:base",
     "//chrome/updater:version_header",
     "//components/crash/core/common:crash_key_lib",
     "//mojo/public/cpp/platform",
   ]
 
-  allow_circular_includes_from = [ "//chrome/updater:common" ]
+  allow_circular_includes_from = [ "//chrome/updater:base" ]
 
   libs = [
     "AppKit.framework",

chrome/updater/mac/setup/setup.mm

@@ -19,9 +19,9 @@
 #include "base/threading/scoped_blocking_call.h"
 #include "build/build_config.h"
 #include "chrome/common/mac/launchd.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/crash_client.h"
 #include "chrome/updater/crash_reporter.h"
-#include "chrome/updater/updater_constants.h"
 #include "chrome/updater/updater_version.h"
 #include "chrome/updater/util.h"
 #include "components/crash/core/common/crash_key.h"

chrome/updater/server/BUILD.gn

@@ -3,11 +3,10 @@
 # found in the LICENSE file.
 
 group("server") {
-  deps = []
   if (is_mac) {
-    deps += [ "//chrome/updater/server/mac" ]
+    public_deps = [ "//chrome/updater/server/mac" ]
   }
   if (is_win) {
-    deps += [ "//chrome/updater/server/win" ]
+    public_deps = [ "//chrome/updater/server/win" ]
   }
 }

chrome/updater/server/mac/BUILD.gn

@@ -13,7 +13,7 @@ source_set("mac") {
 
   deps = [
     "//base",
-    "//chrome/updater:update_service",
+    "//chrome/updater:base",
     "//chrome/updater:version_header",
   ]
 }

chrome/updater/server/win/BUILD.gn

@@ -18,7 +18,7 @@ source_set("win") {
   deps = [
     ":updater_idl_idl",
     "//base",
-    "//chrome/updater:update_service",
+    "//chrome/updater:base",
     "//chrome/updater/win:constants",
   ]
 }

chrome/updater/update_service_in_process.cc

@@ -12,9 +12,9 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/updater/configurator.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/installer.h"
 #include "chrome/updater/registration_data.h"
-#include "chrome/updater/updater_constants.h"
 #include "components/prefs/pref_service.h"
 #include "components/update_client/crx_update_item.h"
 #include "components/update_client/update_client.h"

chrome/updater/updater.cc

@@ -12,11 +12,11 @@
 #include "base/task/thread_pool/thread_pool_instance.h"
 #include "build/build_config.h"
 #include "chrome/updater/configurator.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/crash_client.h"
 #include "chrome/updater/crash_reporter.h"
 #include "chrome/updater/update_apps.h"
 #include "chrome/updater/update_service_in_process.h"
-#include "chrome/updater/updater_constants.h"
 #include "chrome/updater/updater_version.h"
 #include "chrome/updater/util.h"
 #include "components/crash/core/common/crash_key.h"

chrome/updater/win/BUILD.gn

@@ -22,11 +22,11 @@ executable("updater") {
   configs += [ "//build/config/win:windowed" ]
 
   deps = [
-    ":core",
     ":install_app",
+    ":lib",
     ":version_resources",
     "//build/win:default_exe_manifest",
-    "//chrome/updater:common",
+    "//chrome/updater:lib",
     "//chrome/updater/win/ui:ui_resources",
   ]
 }
@@ -57,7 +57,7 @@ source_set("base") {
   deps = [
     ":constants",
     "//base",
-    "//chrome/updater:common",
+    "//chrome/updater:base",
     "//chrome/updater:version_header",
   ]
 
@@ -79,7 +79,7 @@ source_set("constants") {
   ]
 }
 
-source_set("core") {
+source_set("lib") {
   sources = [
     "action_handler.cc",
     "net/net_util.cc",
@@ -105,12 +105,11 @@ source_set("core") {
     ":constants",
     "//base",
     "//chrome/installer/util:with_no_strings",
-    "//chrome/updater:common",
+    "//chrome/updater:base",
     "//chrome/updater/server/win:updater_idl_idl",
     "//components/update_client",
     "//url:url",
   ]
-  allow_circular_includes_from = [ "//chrome/updater:common" ]
 }
 
 source_set("install_progress_observer") {
@@ -134,16 +133,17 @@ source_set("install_app") {
   ]
 
   deps = [
-    ":core",
     ":install_progress_observer",
+    ":lib",
     "//base",
     "//base:i18n",
-    "//chrome/updater:common",
+    "//chrome/updater:base",
+    "//chrome/updater:lib",
     "//chrome/updater/win/ui",
     "//components/prefs",
     "//components/update_client",
   ]
-  allow_circular_includes_from = [ "//chrome/updater:common" ]
+  allow_circular_includes_from = [ "//chrome/updater:lib" ]
 
   cflags_cc = [ "-Wno-missing-braces" ]
 }
@@ -159,8 +159,8 @@ source_set("updater_tests") {
 
   deps = [
     ":base",
-    ":core",
     ":install_app",
+    ":lib",
     "//base/test:test_support",
     "//testing/gtest",
   ]
@@ -183,8 +183,8 @@ test("updater_unittests") {
 
   deps = [
     ":base",
-    ":core",
     ":install_app",
+    ":lib",
     "//base",
     "//base/test:test_support",
     "//chrome/updater:version_header",

chrome/updater/win/install_app.cc

@@ -30,8 +30,8 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/win/atl.h"
 #include "chrome/updater/configurator.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/installer.h"
-#include "chrome/updater/updater_constants.h"
 #include "chrome/updater/win/install_progress_observer.h"
 #include "chrome/updater/win/setup/setup.h"
 #include "chrome/updater/win/ui/progress_wnd.h"

chrome/updater/win/setup/setup.cc

@@ -23,8 +23,8 @@
 #include "chrome/installer/util/install_service_work_item.h"
 #include "chrome/installer/util/self_cleaning_temp_dir.h"
 #include "chrome/installer/util/work_item_list.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/server/win/updater_idl.h"
-#include "chrome/updater/updater_constants.h"
 #include "chrome/updater/util.h"
 #include "chrome/updater/win/constants.h"
 #include "chrome/updater/win/setup/setup_util.h"

chrome/updater/win/setup/uninstall.cc

@@ -22,7 +22,7 @@
 #include "chrome/installer/util/install_service_work_item.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/work_item_list.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/util.h"
 #include "chrome/updater/win/constants.h"
 #include "chrome/updater/win/setup/setup_util.h"

chrome/updater/win/test/BUILD.gn

@@ -25,8 +25,8 @@ source_set("test_common") {
 
   deps = [
     "//base",
-    "//chrome/updater:common",
-    "//chrome/updater/win:core",
+    "//chrome/updater:base",
+    "//chrome/updater/win:base",
     "//chrome/updater/win:install_app",
   ]
 }
@@ -45,7 +45,7 @@ source_set("test_executables") {
     ":test_common",
     ":test_strings",
     "//base",
-    "//chrome/updater:common",
+    "//chrome/updater:base",
   ]
 }
 

chrome/updater/win/test/test_executables.cc

@@ -14,7 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/win/win_util.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/win/test/test_inheritable_event.h"
 #include "chrome/updater/win/test/test_strings.h"
 

chrome/updater/win/test/test_initializer.cc

@@ -13,7 +13,7 @@
 #include "base/time/time.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 
 namespace updater {
 

chrome/updater/win/ui/BUILD.gn

@@ -39,7 +39,7 @@ source_set("ui") {
     ":ui_resources",
     "//base",
     "//base:i18n",
-    "//chrome/updater:common",
+    "//chrome/updater:base",
     "//chrome/updater/win:base",
     "//chrome/updater/win:install_progress_observer",
     "//third_party/wtl",

chrome/updater/win/ui/progress_wnd.cc

@@ -11,7 +11,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/util.h"
 #include "chrome/updater/win/ui/constants.h"
 #include "chrome/updater/win/ui/ui_ctls.h"

chrome/updater/win/util.cc

@@ -16,7 +16,7 @@
 #include "base/strings/strcat.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/updater/updater_constants.h"
+#include "chrome/updater/constants.h"
 #include "chrome/updater/win/constants.h"
 #include "chrome/updater/win/user_info.h"