IWYU cleanups in chrome/installer/util.

BUG=none R=thakis@chromium.org Review-Url: https://codereview.chromium.org/2793533002 Cr-Commit-Position: refs/heads/master@{#461098}
Denger-Network · Mar 31, 2017 · 3607f5e · 3607f5e
1 parent b50cee4
commit 3607f5e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
@@ -27,6 +27,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "base/version.h"
 #include "base/win/pe_image.h"
 #include "base/win/registry.h"
 #include "base/win/win_util.h"

diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
@@ -12,24 +12,16 @@
 #include <utility>
 
 #include "base/atomicops.h"
-#include "base/command_line.h"
-#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/win/registry.h"
-#include "base/win/windows_version.h"
-#include "chrome/common/env_vars.h"
 #include "chrome/installer/util/app_registration_data.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
-#include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/non_updating_app_registration_data.h"
 
-using installer::MasterPreferences;
-
 namespace {
 
 // The BrowserDistribution objects are never freed.

diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
@@ -10,10 +10,8 @@
 #include <memory>
 #include <string>
 
-#include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
-#include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/installer/util/util_constants.h"
 
@@ -23,6 +21,11 @@
 
 class AppRegistrationData;
 
+namespace base {
+class FilePath;
+class Version;
+}
+
 class BrowserDistribution {
  public:
   enum Subfolder {

diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
@@ -24,15 +24,13 @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/app_registration_data.h"
-#include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/uninstall_metrics.h"
 #include "chrome/installer/util/updating_app_registration_data.h"
-#include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/wmi.h"
 #include "third_party/crashpad/crashpad/client/crash_report_database.h"
 #include "third_party/crashpad/crashpad/client/settings.h"

diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc
@@ -19,6 +19,7 @@
 #include "base/strings/string_util.h"
 #include "base/test/scoped_path_override.h"
 #include "base/test/test_reg_util_win.h"
+#include "base/version.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/test_app_registration_data.h"

diff --git a/chrome/installer/util/product_unittest.cc b/chrome/installer/util/product_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
+#include "base/version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"