diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 20:48:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 20:48:26 +0000 |
| commit | cc2806854ca9c81d8175a2c318f5a6814a884792 (patch) | |
| tree | 0c1cc6fa14290c8dfac05ebe1965ac0ab750b274 /chrome/browser/ui/browser_browsertest.cc | |
| parent | a55fa8c0dc2763ce42c8c08fbb7aa92501744b39 (diff) | |
| download | chromium_src-cc2806854ca9c81d8175a2c318f5a6814a884792.zip chromium_src-cc2806854ca9c81d8175a2c318f5a6814a884792.tar.gz chromium_src-cc2806854ca9c81d8175a2c318f5a6814a884792.tar.bz2 | |
Extract StartupTabs and startup types from StartupBrowserCreator.
BUG=none
TEST=none
TBR=sky
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136573
Review URL: https://chromiumcodereview.appspot.com/10384106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_browsertest.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 0dd7420..5fa8e4c 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -36,6 +36,7 @@ #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" @@ -898,11 +899,10 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) { 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. @@ -1252,10 +1252,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { // 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>()); |