| Index: chrome/browser/ui/browser_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser_browsertest.cc (revision 136345)
|
| +++ chrome/browser/ui/browser_browsertest.cc (working copy)
|
| @@ -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,9 +898,11 @@
|
| CommandLine command_line(CommandLine::NO_PROGRAM);
|
| command_line.AppendSwitchASCII(switches::kAppId, extension_app->id());
|
|
|
| - BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
|
| - BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN;
|
| - BrowserInit::LaunchWithProfile launch(FilePath(), command_line, first_run);
|
| + StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
|
| + StartupBrowserCreator::IS_FIRST_RUN :
|
| + StartupBrowserCreator::IS_NOT_FIRST_RUN;
|
| + StartupBrowserCreator::LaunchWithProfile launch(FilePath(), command_line,
|
| + first_run);
|
| ASSERT_TRUE(launch.OpenApplicationWindow(browser()->profile()));
|
|
|
| // Check that the new browser has an app name.
|
| @@ -1250,9 +1252,10 @@
|
|
|
| // Simulate launching again.
|
| CommandLine dummy(CommandLine::NO_PROGRAM);
|
| - BrowserInit::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
|
| - BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN;
|
| - BrowserInit::LaunchWithProfile launch(FilePath(), dummy, first_run);
|
| + StartupBrowserCreator::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
|
| + StartupBrowserCreator::IS_FIRST_RUN :
|
| + StartupBrowserCreator::IS_NOT_FIRST_RUN;
|
| + StartupBrowserCreator::LaunchWithProfile launch(FilePath(), dummy, first_run);
|
| launch.profile_ = browser()->profile();
|
| launch.ProcessStartupURLs(std::vector<GURL>());
|
|
|
|
|