Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/ui/browser_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #if defined(OS_MACOSX)
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/fullscreen_controller.h"
 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
+#include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
@@ skipping 842 matching lines @@
   ASSERT_TRUE(test_server()->Start());
 
   // Load an app.
   host_resolver()->AddRule("www.example.com", "127.0.0.1");
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
   const Extension* extension_app = GetExtension();
 
   CommandLine command_line(CommandLine::NO_PROGRAM);
   command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
 
-  StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
-      StartupBrowserCreator::IS_FIRST_RUN :
-      StartupBrowserCreator::IS_NOT_FIRST_RUN;
-  StartupBrowserCreator::LaunchWithProfile launch(FilePath(), command_line,
-                                                  first_run);
+  browser::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
+      browser::startup::IS_FIRST_RUN :
+      browser::startup::IS_NOT_FIRST_RUN;
+  StartupBrowserCreatorImpl launch(FilePath(), command_line, first_run);
   ASSERT_TRUE(launch.OpenApplicationWindow(browser()->profile()));
 
   // Check that the new browser has an app name.
   // The launch should have created a new browser.
   ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* new_browser = NULL;
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end() && !new_browser; ++i) {
@@ skipping 329 matching lines @@
   // Add a pinned non-app tab.
   browser()->NewTab();
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
   model->SetTabPinned(2, true);
 
   // Write out the pinned tabs.
   PinnedTabCodec::WritePinnedTabs(browser()->profile());
 
   // Simulate launching again.
   CommandLine dummy(CommandLine::NO_PROGRAM);
-  StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
-      StartupBrowserCreator::IS_FIRST_RUN :
-      StartupBrowserCreator::IS_NOT_FIRST_RUN;
-  StartupBrowserCreator::LaunchWithProfile launch(FilePath(), dummy, first_run);
+  browser::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
+      browser::startup::IS_FIRST_RUN : browser::startup::IS_NOT_FIRST_RUN;
+  StartupBrowserCreatorImpl launch(FilePath(), dummy, first_run);
   launch.profile_ = browser()->profile();
   launch.ProcessStartupURLs(std::vector<GURL>());
 
   // The launch should have created a new browser.
   ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* new_browser = NULL;
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end() && !new_browser; ++i) {
@@ skipping 633 matching lines @@
      command_line->AppendSwitchASCII(switches::kApp, url.spec());
    }
 };
 
 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) {
   // Test that an application browser window loads correctly.
 
   // Verify the browser is in application mode.
   EXPECT_TRUE(browser()->IsApplication());
 }