| Index: chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
|
| diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
|
| index fc2e89f7b5326ba7923d641392e1d75b74ca7b7e..16f4e2099008e39df374a3c08595422e60652fce 100644
|
| --- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
|
| +++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
|
| @@ -103,7 +103,6 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
|
| urls.push_back(embedded_test_server()->GetURL("/title2.html"));
|
|
|
| Profile* profile = browser()->profile();
|
| - chrome::HostDesktopType host_desktop_type = browser()->host_desktop_type();
|
|
|
| // Set the startup preference to open these URLs.
|
| SessionStartupPref pref(SessionStartupPref::URLS);
|
| @@ -123,8 +122,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
|
| base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
|
| StartupBrowserCreatorImpl launch(base::FilePath(), dummy,
|
| chrome::startup::IS_NOT_FIRST_RUN);
|
| - ASSERT_TRUE(
|
| - launch.Launch(profile, std::vector<GURL>(), false, host_desktop_type));
|
| + ASSERT_TRUE(launch.Launch(profile, std::vector<GURL>(), false));
|
|
|
| // This should have created a new browser window. |browser()| is still
|
| // around at this point, even though we've closed its window.
|
| @@ -163,8 +161,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
|
| base::CommandLine dummy(base::CommandLine::NO_PROGRAM);
|
| StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
|
| chrome::startup::IS_FIRST_RUN);
|
| - ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true,
|
| - browser()->host_desktop_type()));
|
| + ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), true));
|
|
|
| // This should have created a new browser window.
|
| Browser* new_browser = FindOneOtherBrowser(browser());
|
| @@ -205,8 +202,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
|
| {
|
| StartupBrowserCreatorImpl launch(base::FilePath(), dummy,
|
| chrome::startup::IS_NOT_FIRST_RUN);
|
| - ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false,
|
| - browser()->host_desktop_type()));
|
| + ASSERT_TRUE(
|
| + launch.Launch(browser()->profile(), std::vector<GURL>(), false));
|
| }
|
|
|
| // This should have created a new browser window. |browser()| is still
|
| @@ -240,8 +237,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTriggeredResetTest,
|
| {
|
| StartupBrowserCreatorImpl launch(base::FilePath(), dummy,
|
| chrome::startup::IS_NOT_FIRST_RUN);
|
| - ASSERT_TRUE(launch.Launch(other_profile, std::vector<GURL>(), false,
|
| - new_browser->host_desktop_type()));
|
| + ASSERT_TRUE(launch.Launch(other_profile, std::vector<GURL>(), false));
|
| }
|
|
|
| Browser* other_profile_browser =
|
|
|