| Index: chrome/browser/apps/app_browsertest.cc
|
| diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
|
| index f513a78c69cd9e6dd53a369702e8bda787b8b4e5..b2ac59e89001dca55bce48ba263f4b1d8997f78a 100644
|
| --- a/chrome/browser/apps/app_browsertest.cc
|
| +++ b/chrome/browser/apps/app_browsertest.cc
|
| @@ -231,9 +231,9 @@ class PlatformAppWithFileBrowserTest: public PlatformAppBrowserTest {
|
| return false;
|
| }
|
|
|
| - AppLaunchParams params(browser()->profile(), extension,
|
| - extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
|
| - extensions::SOURCE_TEST);
|
| + AppLaunchParams params(
|
| + browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
|
| + WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
|
| params.command_line = command_line;
|
| params.current_directory = test_data_dir_;
|
| OpenApplication(params);
|
| @@ -880,9 +880,9 @@ void PlatformAppDevToolsBrowserTest::RunTestWithDevTools(
|
| content::WindowedNotificationObserver app_loaded_observer(
|
| content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
|
| content::NotificationService::AllSources());
|
| - OpenApplication(AppLaunchParams(browser()->profile(), extension,
|
| - LAUNCH_CONTAINER_NONE, NEW_WINDOW,
|
| - extensions::SOURCE_TEST));
|
| + OpenApplication(AppLaunchParams(
|
| + browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
|
| + WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
|
| app_loaded_observer.Wait();
|
| window = GetFirstAppWindow();
|
| ASSERT_TRUE(window);
|
| @@ -1011,9 +1011,9 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
|
| ASSERT_TRUE(should_install.seen());
|
|
|
| ExtensionTestMessageListener launched_listener("Launched", false);
|
| - OpenApplication(AppLaunchParams(browser()->profile(), extension,
|
| - LAUNCH_CONTAINER_NONE, NEW_WINDOW,
|
| - extensions::SOURCE_TEST));
|
| + OpenApplication(AppLaunchParams(
|
| + browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
|
| + WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
|
|
|
| ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
|
| }
|
| @@ -1034,9 +1034,9 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
|
| ASSERT_TRUE(extension);
|
|
|
| ExtensionTestMessageListener launched_listener("Launched", false);
|
| - OpenApplication(AppLaunchParams(browser()->profile(), extension,
|
| - LAUNCH_CONTAINER_NONE, NEW_WINDOW,
|
| - extensions::SOURCE_TEST));
|
| + OpenApplication(AppLaunchParams(
|
| + browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
|
| + WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
|
|
|
| ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
|
| ASSERT_FALSE(should_not_install.seen());
|
| @@ -1072,9 +1072,9 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ComponentAppBackgroundPage) {
|
| ASSERT_TRUE(should_install.seen());
|
|
|
| ExtensionTestMessageListener launched_listener("Launched", false);
|
| - OpenApplication(AppLaunchParams(browser()->profile(), extension,
|
| - LAUNCH_CONTAINER_NONE, NEW_WINDOW,
|
| - extensions::SOURCE_TEST));
|
| + OpenApplication(AppLaunchParams(
|
| + browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
|
| + WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
|
|
|
| ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
|
| }
|
| @@ -1097,9 +1097,9 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
|
|
|
| {
|
| ExtensionTestMessageListener launched_listener("Launched", false);
|
| - OpenApplication(AppLaunchParams(browser()->profile(), extension,
|
| - LAUNCH_CONTAINER_NONE, NEW_WINDOW,
|
| - extensions::SOURCE_TEST));
|
| + OpenApplication(AppLaunchParams(
|
| + browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
|
| + WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
|
| ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
|
| }
|
|
|
| @@ -1244,8 +1244,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppIncognitoBrowserTest, IncognitoComponentApp) {
|
| registry->AddObserver(this);
|
|
|
| OpenApplication(CreateAppLaunchParamsUserContainer(
|
| - incognito_profile, file_manager, NEW_FOREGROUND_TAB,
|
| - extensions::SOURCE_TEST));
|
| + incognito_profile, file_manager,
|
| + WindowOpenDisposition::NEW_FOREGROUND_TAB, extensions::SOURCE_TEST));
|
|
|
| while (!base::ContainsKey(opener_app_ids_, file_manager->id())) {
|
| content::RunAllPendingInMessageLoop();
|
|
|