Cleanup includes in c/b/first_run/first_run_*.(cc|mm) code.

The platform-specific files used to do a lot more, they are now only used for small first_run::internal:: utility methods.

Prevents landing of https://codereview.chromium.org/18052010/

BUG=243423
R=grt@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209866 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 11 insertions, 35 deletions

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index adfa6b2..445c8a6 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -453,9 +453,6 @@ bool IsOrganicFirstRun() {
 #endif
 
 }  // namespace internal
-}  // namespace first_run
-
-namespace first_run {
 
 MasterPrefs::MasterPrefs()
     : ping_delay(0),
diff --git a/chrome/browser/first_run/first_run_internal.h b/chrome/browser/first_run/first_run_internal.h
index ae6f152..697f20e 100644
--- a/chrome/browser/first_run/first_run_internal.h
+++ b/chrome/browser/first_run/first_run_internal.h
@@ -17,6 +17,7 @@ class CommandLine;
 class GURL;
 class ImporterHost;
 class ImporterList;
+class MasterPrefs;
 class Profile;
 class ProcessSingleton;
 class TemplateURLService;
diff --git a/chrome/browser/first_run/first_run_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc
index 3a2b58d..f2441e2 100644
--- a/chrome/browser/first_run/first_run_linux.cc
+++ b/chrome/browser/first_run/first_run_internal_linux.cc
@@ -2,26 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/first_run/first_run_internal.h"
 
-#include "base/command_line.h"
+#include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/first_run/first_run_internal.h"
-#include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/process_singleton.h"
-#include "chrome/browser/shell_integration.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/master_preferences.h"
-#include "content/public/common/result_codes.h"
-#include "ui/base/ui_base_switches.h"
-#include "url/gurl.h"
 
 namespace first_run {
 namespace internal {
diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_internal_mac.mm
index 85a43d2..38efc78 100644
--- a/chrome/browser/first_run/first_run_mac.mm
+++ b/chrome/browser/first_run/first_run_internal_mac.mm
@@ -2,15 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/first_run/first_run.h"
-
-#include "base/files/file_path.h"
-#include "base/strings/string_util.h"
 #include "chrome/browser/first_run/first_run_internal.h"
-#include "chrome/browser/importer/external_process_importer_host.h"
-#include "chrome/browser/importer/importer_host.h"
+
 #include "chrome/browser/mac/master_prefs.h"
-#include "chrome/browser/process_singleton.h"
 
 namespace first_run {
 namespace internal {
diff --git a/chrome/browser/first_run/first_run_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc
index 7498a90e..ce26df8 100644
--- a/chrome/browser/first_run/first_run_posix.cc
+++ b/chrome/browser/first_run/first_run_internal_posix.cc
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/first_run/first_run_internal.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run_dialog.h"
-#include "chrome/browser/first_run/first_run_internal.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_internal_win.cc
index 26d4de0..d54c76a 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_internal_win.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/browser/first_run/first_run.h"
+#include "chrome/browser/first_run/first_run_internal.h"
 
 #include <shellapi.h>
 
@@ -17,7 +17,6 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "base/win/metro.h"
-#include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 342a58e..ebfead9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -565,10 +565,10 @@
         'browser/first_run/first_run.h',
         'browser/first_run/first_run_dialog.h',
         'browser/first_run/first_run_internal.h',
-        'browser/first_run/first_run_linux.cc',
-        'browser/first_run/first_run_mac.mm',
-        'browser/first_run/first_run_posix.cc',
-        'browser/first_run/first_run_win.cc',
+        'browser/first_run/first_run_internal_linux.cc',
+        'browser/first_run/first_run_internal_mac.mm',
+        'browser/first_run/first_run_internal_posix.cc',
+        'browser/first_run/first_run_internal_win.cc',
         'browser/first_run/try_chrome_dialog_view.cc',
         'browser/first_run/try_chrome_dialog_view.h',
         'browser/first_run/upgrade_util.cc',