Revert 136337 - Rename BrowserInit to StartupBrowserCreator, and move into startup subdir.

BUG=none
TEST=none
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10356100

TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382108

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

5 files changed, 17 insertions, 18 deletions

diff --git a/chrome/browser/profiles/avatar_menu_model.cc b/chrome/browser/profiles/avatar_menu_model.cc
index 8a8df27..11c0076 100644
--- a/chrome/browser/profiles/avatar_menu_model.cc
+++ b/chrome/browser/profiles/avatar_menu_model.cc
@@ -15,9 +15,9 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
@@ -36,8 +36,8 @@ void OnProfileCreated(bool always_create,
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
-        StartupBrowserCreator::IS_NOT_PROCESS_STARTUP,
-        StartupBrowserCreator::IS_NOT_FIRST_RUN,
+        BrowserInit::IS_NOT_PROCESS_STARTUP,
+        BrowserInit::IS_NOT_FIRST_RUN,
         always_create);
   }
 }
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 143c96d..2642240 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -63,7 +63,7 @@
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/ui/startup/startup_browser_creator.h"
+#include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
@@ -363,8 +363,8 @@ void ProfileImpl::DoFinalInit(bool is_new_profile) {
       SessionStartupPref::GetDefaultStartupType();
 #else
   SessionStartupPref::Type startup_pref_type =
-      StartupBrowserCreator::GetSessionStartupPref(
-          *CommandLine::ForCurrentProcess(), this).type;
+      BrowserInit::GetSessionStartupPref(*CommandLine::ForCurrentProcess(),
+                                         this).type;
 #endif
   bool restore_old_session_cookies =
       session_restore_enabled_ &&
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index a9f51b2..93fd178 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -130,8 +130,7 @@ class ProfileImpl : public Profile,
 
  private:
   friend class Profile;
-  FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
-                           ProfilesLaunchedAfterCrash);
+  FRIEND_TEST_ALL_PREFIXES(BrowserInitTest, ProfilesLaunchedAfterCrash);
   FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest, ProfileReadmeCreated);
   FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest,
                            ProfileDeletedBeforeReadmeCreated);
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 4abb87e..64385fd 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -150,8 +150,8 @@ void OnOpenWindowForNewProfile(Profile* profile,
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
-        StartupBrowserCreator::IS_PROCESS_STARTUP,
-        StartupBrowserCreator::IS_FIRST_RUN,
+        BrowserInit::IS_PROCESS_STARTUP,
+        BrowserInit::IS_FIRST_RUN,
         false);
   }
 }
@@ -469,8 +469,8 @@ Profile* ProfileManager::GetProfileByPath(const FilePath& path) const {
 // static
 void ProfileManager::FindOrCreateNewWindowForProfile(
     Profile* profile,
-    StartupBrowserCreator::IsProcessStartup process_startup,
-    StartupBrowserCreator::IsFirstRun is_first_run,
+    BrowserInit::IsProcessStartup process_startup,
+    BrowserInit::IsFirstRun is_first_run,
     bool always_create) {
   DCHECK(profile);
 
@@ -485,9 +485,9 @@ void ProfileManager::FindOrCreateNewWindowForProfile(
   content::RecordAction(UserMetricsAction("NewWindow"));
   CommandLine command_line(CommandLine::NO_PROGRAM);
   int return_code;
-  StartupBrowserCreator browser_creator;
-  browser_creator.LaunchBrowser(command_line, profile, FilePath(),
-                                process_startup, is_first_run, &return_code);
+  BrowserInit browser_init;
+  browser_init.LaunchBrowser(command_line, profile, FilePath(),
+                             process_startup, is_first_run, &return_code);
 }
 
 void ProfileManager::Observe(
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index 8f02319..38da261 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -20,8 +20,8 @@
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -147,8 +147,8 @@ class ProfileManager : public base::NonThreadSafe,
   // creation of a window from the multi-profile dropdown menu.
   static void FindOrCreateNewWindowForProfile(
       Profile* profile,
-      StartupBrowserCreator::IsProcessStartup process_startup,
-      StartupBrowserCreator::IsFirstRun is_first_run,
+      BrowserInit::IsProcessStartup process_startup,
+      BrowserInit::IsFirstRun is_first_run,
       bool always_create);
 
   // Profile::Delegate implementation: