Remove dependency on resources from installer_util

chrome/installer/util used to depend on chrome:resources but was apparently never used. This causes a problem because chrome_watcher.dll depends on installer_util, and chrome:resources depends on the omnibox mojo target. To get this dependency "right" we would have to link all of mojo system into chrome_watcher.dll. It is properly dead-code stripped (I checked) but this still seems undesirable.

I removed the dependency and also made //chrome/installer/* "gn check" clean. There were some other unnecessary deps and header file uses.

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg

Review URL: https://codereview.chromium.org/1148173002

Cr-Commit-Position: refs/heads/master@{#330895}

5 files changed, 9 insertions, 6 deletions

diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
index 3e7da02..fe40610 100644
--- a/chrome/installer/util/BUILD.gn
+++ b/chrome/installer/util/BUILD.gn
@@ -8,8 +8,10 @@ import("//testing/test.gni")
 static_library("util") {
   deps = [
     "//base",
-    "//chrome:resources",
     "//chrome:strings",
+    "//chrome/common:constants",
+    "//chrome/common:result_codes",
+    "//content/public/common:result_codes",
   ]
 
   if (is_win) {
@@ -58,7 +60,6 @@ static_library("util") {
     deps += [
       ":strings",
       "//base/third_party/dynamic_annotations",
-      "//chrome/common:constants",
       "//components/metrics",
       "//courgette:courgette_lib",
       "//crypto",
@@ -261,6 +262,7 @@ if (is_win) {
       "//base:i18n",
       "//base/test:test_support",
       "//chrome:other_version",
+      "//chrome/common",
       "//chrome/installer/test:alternate_version_generator_lib",
       "//content/public/common",
       "//testing/gmock",
diff --git a/chrome/installer/util/DEPS b/chrome/installer/util/DEPS
index 0148070..2f05ced 100644
--- a/chrome/installer/util/DEPS
+++ b/chrome/installer/util/DEPS
@@ -1,3 +1,7 @@
 include_rules = [
+  # This file is generated but otherwise would be excluded because of the
+  # "-chrome" rule in a parent dir.
+  "+chrome/grit/chromium_strings.h",
+
   "+components/metrics/client_info.h",
 ]
diff --git a/chrome/installer/util/auto_launch_util.cc b/chrome/installer/util/auto_launch_util.cc
index 5e797ba..2c1081a 100644
--- a/chrome/installer/util/auto_launch_util.cc
+++ b/chrome/installer/util/auto_launch_util.cc
@@ -14,7 +14,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/installer/util/util_constants.h"
 #include "crypto/sha2.h"
 
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index ff32f5854..22150a6 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -31,7 +31,6 @@
 #include "chrome/installer/util/updating_app_registration_data.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/wmi.h"
-#include "content/public/common/result_codes.h"
 
 namespace {
 
diff --git a/chrome/installer/util/user_experiment.cc b/chrome/installer/util/user_experiment.cc
index a5f6e2e..d8ce4dd 100644
--- a/chrome/installer/util/user_experiment.cc
+++ b/chrome/installer/util/user_experiment.cc
@@ -20,10 +20,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "chrome/common/attrition_experiments.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/grit/chromium_strings.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -306,7 +306,6 @@ bool CreateExperimentDetails(int flavor, ExperimentDetails* experiment) {
   // The experiment in Feb 2011 used SJxx SKxx SLxx SMxx.
   // The experiment in Mar 2012 used ZAxx ZBxx ZCxx.
   // The experiment in Jan 2013 uses DAxx.
-  using namespace attrition_experiments;
 
   static const struct UserExperimentSpecs {
     const wchar_t* locale;  // Locale to show this experiment for (* for all).