Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/profiles/profile_manager.cc

Index: chrome/browser/profiles/profile_manager.cc
===================================================================
--- chrome/browser/profiles/profile_manager.cc	(revision 136581)
+++ chrome/browser/profiles/profile_manager.cc	(working copy)
@@ -29,7 +29,6 @@
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -151,8 +150,8 @@
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
-        browser::startup::IS_PROCESS_STARTUP,
-        browser::startup::IS_FIRST_RUN,
+        StartupBrowserCreator::IS_PROCESS_STARTUP,
+        StartupBrowserCreator::IS_FIRST_RUN,
         false);
   }
 }
@@ -470,8 +469,8 @@
 // static
 void ProfileManager::FindOrCreateNewWindowForProfile(
     Profile* profile,
-    browser::startup::IsProcessStartup process_startup,
-    browser::startup::IsFirstRun is_first_run,
+    StartupBrowserCreator::IsProcessStartup process_startup,
+    StartupBrowserCreator::IsFirstRun is_first_run,
     bool always_create) {
   DCHECK(profile);