diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 18:14:21 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 18:14:21 +0000 |
| commit | 826012343fb2a661c7dda67f078b89fcf536e22b (patch) | |
| tree | c6c39cbe5123c5563b9a58170cf239dd74ad5177 /chrome/browser/ui/browser_browsertest.cc | |
| parent | c7221b423e1d051dc5b68cb3f66cfe11398f5696 (diff) | |
| download | chromium_src-826012343fb2a661c7dda67f078b89fcf536e22b.zip chromium_src-826012343fb2a661c7dda67f078b89fcf536e22b.tar.gz chromium_src-826012343fb2a661c7dda67f078b89fcf536e22b.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/ui/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_browsertest.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 0dd7420..bd88449 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -30,12 +30,12 @@ #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_init.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/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -898,11 +898,9 @@ 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); + BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? + BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN; + BrowserInit::LaunchWithProfile launch(FilePath(), command_line, first_run); ASSERT_TRUE(launch.OpenApplicationWindow(browser()->profile())); // Check that the new browser has an app name. @@ -1252,10 +1250,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); + BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ? + BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN; + BrowserInit::LaunchWithProfile launch(FilePath(), dummy, first_run); launch.profile_ = browser()->profile(); launch.ProcessStartupURLs(std::vector<GURL>()); |