| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| index 42a4047d5ff7eaec37702b49751f5fa9a3bdab48..492cd2cde2797e673b2f0d1890967522f968d9fa 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| @@ -925,9 +925,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchInBackground) {
|
| LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
|
| WindowOpenDisposition::NEW_BACKGROUND_TAB);
|
| EXPECT_EQ(++tab_count, tab_strip->count());
|
| - controller_->LaunchApp(last_loaded_extension_id(),
|
| - ash::LAUNCH_FROM_UNKNOWN,
|
| - 0);
|
| + controller_->LaunchApp(last_loaded_extension_id(), std::string(),
|
| + ash::LAUNCH_FROM_UNKNOWN, 0);
|
| }
|
|
|
| // Confirm that clicking a icon for an app running in one of 2 maxmized windows
|
| @@ -977,12 +976,10 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ActivateApp) {
|
| IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchApp) {
|
| TabStripModel* tab_strip = browser()->tab_strip_model();
|
| int tab_count = tab_strip->count();
|
| - const Extension* extension =
|
| - LoadExtension(test_data_dir_.AppendASCII("app1"));
|
| -
|
| - controller_->LaunchApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
|
| + std::string app_id = LoadExtension(test_data_dir_.AppendASCII("app1"))->id();
|
| + controller_->LaunchApp(app_id, std::string(), ash::LAUNCH_FROM_UNKNOWN, 0);
|
| EXPECT_EQ(++tab_count, tab_strip->count());
|
| - controller_->LaunchApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
|
| + controller_->LaunchApp(app_id, std::string(), ash::LAUNCH_FROM_UNKNOWN, 0);
|
| EXPECT_EQ(++tab_count, tab_strip->count());
|
| }
|
|
|
|
|