Fix GN dependencies.

* Removes //chrome/updater:updater_constants target
* Fixes the dependencies to get a clean run for 'gn check out/default //chrome/updater/*'

R=waffles
CC=milagreen

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

chrome/updater/BUILD.gn

@@ -44,12 +44,13 @@ if (is_win || is_mac) {
       "update_apps.h",
       "updater.cc",
       "updater.h",
+      "updater_constants.cc",
+      "updater_constants.h",
       "util.cc",
       "util.h",
     ]
 
     deps = [
-      ":updater_constants",
       ":version_header",
       "//base",
       "//components/crash/core/common:crash_key",
@@ -66,13 +67,6 @@ if (is_win || is_mac) {
     ]
   }
 
-  source_set("updater_constants") {
-    sources = [
-      "updater_constants.cc",
-      "updater_constants.h",
-    ]
-  }
-
   process_version("version_header") {
     sources = [
       "//chrome/VERSION",

chrome/updater/win/BUILD.gn

@@ -64,6 +64,8 @@ source_set("base") {
 
   deps = [
     "//base",
+    "//chrome/updater:common",
+    "//chrome/updater:version_header",
   ]
 
   libs = [
@@ -97,7 +99,6 @@ source_set("core") {
     "//base",
     "//chrome/installer/util:with_no_strings",
     "//chrome/updater:common",
-    "//chrome/updater:updater_constants",
     "//components/update_client",
     "//url:url",
   ]
@@ -132,7 +133,6 @@ source_set("install_app") {
     "//base",
     "//base:i18n",
     "//chrome/updater:common",
-    "//chrome/updater:updater_constants",
     "//chrome/updater/win/ui",
     "//components/prefs",
     "//components/update_client",

chrome/updater/win/test/BUILD.gn

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

chrome/updater/win/ui/BUILD.gn

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