Revert r165772: Keep browser process alive while there are platform apps with background pages runn…

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ skipping 106 matching lines @@
   }
 
   ash::Launcher* launcher_;
   ash::LauncherModel* model_;
 };
 
 // Test that we can launch a platform app and get a running item.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchUnpinned) {
   ash::Launcher* launcher = ash::Launcher::ForPrimaryDisplay();
   int item_count = launcher->model()->item_count();
-  const Extension* extension = LoadPlatformApp("launch");
+  const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher->model()->item_count());
   ash::LauncherItem item =
       launcher->model()->items()[launcher->model()->item_count() - 2];
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
   CloseShellWindow(window);
   --item_count;
   EXPECT_EQ(item_count, launcher->model()->item_count());
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Test that we can launch a platform app that already has a shortcut.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, LaunchPinned) {
   int item_count = launcher_->model()->item_count();
 
   // First get app_id.
-  const Extension* extension = LoadPlatformApp("launch");
+  const Extension* extension = LoadAndLaunchPlatformApp("launch");
   const std::string app_id = extension->id();
 
   // Then create a shortcut.
   ash::LauncherID shortcut_id = CreateAppShortcutLauncherItem(app_id);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item = *launcher_->model()->ItemByID(shortcut_id);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, item.type);
   EXPECT_EQ(ash::STATUS_CLOSED, item.status);
 
   // Open a window. Confirm the item is now running.
   ShellWindow* window = CreateShellWindow(extension);
   ash::wm::ActivateWindow(window->GetNativeWindow());
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   item = *launcher_->model()->ItemByID(shortcut_id);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Then close it, make sure there's still an item.
   CloseShellWindow(window);
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   item = *launcher_->model()->ItemByID(shortcut_id);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, item.type);
   EXPECT_EQ(ash::STATUS_CLOSED, item.status);
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, PinRunning) {
   // Run.
   int item_count = launcher_->model()->item_count();
-  const Extension* extension = LoadPlatformApp("launch");
+  const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID id = item.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Create a shortcut. The app item should be after it.
@@ skipping 13 matching lines @@
   // New shortcuts should come after the item.
   ash::LauncherID bar_id = CreateAppShortcutLauncherItem("bar");
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   EXPECT_LT(launcher_->model()->ItemIndexByID(id),
             launcher_->model()->ItemIndexByID(bar_id));
 
   // Then close it, make sure the item remains.
   CloseShellWindow(window);
   ASSERT_EQ(item_count, launcher_->model()->item_count());
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, UnpinRunning) {
   int item_count = launcher_->model()->item_count();
 
   // First get app_id.
-  const Extension* extension = LoadPlatformApp("launch");
+  const Extension* extension = LoadAndLaunchPlatformApp("launch");
   const std::string app_id = extension->id();
 
   // Then create a shortcut.
   ash::LauncherID shortcut_id = CreateAppShortcutLauncherItem(app_id);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item = *launcher_->model()->ItemByID(shortcut_id);
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, item.type);
   EXPECT_EQ(ash::STATUS_CLOSED, item.status);
 
@@ skipping 20 matching lines @@
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
   // The item should have moved after the other shortcuts.
   EXPECT_GT(launcher_->model()->ItemIndexByID(shortcut_id),
             launcher_->model()->ItemIndexByID(foo_id));
 
   // Then close it, make sure the item's gone.
   CloseShellWindow(window);
   --item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Test that we can launch a platform app with more than one window.
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MultipleWindows) {
   int item_count = launcher_->model()->item_count();
 
   // First run app.
-  const Extension* extension = LoadPlatformApp("launch");
+  const Extension* extension = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window1 = CreateShellWindow(extension);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID item_id = item.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Add second window.
   ShellWindow* window2 = CreateShellWindow(extension);
   // Confirm item stays.
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   item = *launcher_->model()->ItemByID(item_id);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Close second window.
   CloseShellWindow(window2);
   // Confirm item stays.
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   item = *launcher_->model()->ItemByID(item_id);
   EXPECT_EQ(ash::STATUS_ACTIVE, item.status);
 
   // Close first window.
   CloseShellWindow(window1);
   // Confirm item is removed.
   --item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Times out on ChromeOS: http://crbug.com/159394
 #if defined(OS_CHROMEOS)
 #define MAYBE_MultipleApps DISABLED_MultipleApps
 #else
 #define MAYBE_MultipleApps MultipleApps
 #endif
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MAYBE_MultipleApps) {
   int item_count = launcher_->model()->item_count();
 
   // First run app.
-  const Extension* extension1 = LoadPlatformApp("launch");
+  const Extension* extension1 = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window1 = CreateShellWindow(extension1);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item1 =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   // Then run second app.
-  const Extension* extension2 = LoadPlatformApp("launch_2");
+  const Extension* extension2 = LoadAndLaunchPlatformApp("launch_2");
   ShellWindow* window2 = CreateShellWindow(extension2);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item2 =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID item_id2 = item2.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item2.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item2.status);
 
   EXPECT_NE(item_id1, item_id2);
   EXPECT_EQ(ash::STATUS_RUNNING,
             launcher_->model()->ItemByID(item_id1)->status);
 
   // Close second app.
   CloseShellWindow(window2);
   --item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   // First app should be active again.
   EXPECT_EQ(ash::STATUS_ACTIVE,
             launcher_->model()->ItemByID(item_id1)->status);
 
   // Close first app.
   CloseShellWindow(window1);
   --item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
-  CloseShellWindowsAndWaitForAppToExit();
+
 }
 
 // Confirm that app windows can be reactivated by clicking their icons and that
 // the correct activation order is maintained.
 // Times out on ChromeOS: http://crbug.com/159394
 #if defined(OS_CHROMEOS)
 #define MAYBE_WindowActivation DISABLED_WindowActivation
 #else
 #define MAYBE_WindowActivation WindowActivation
 #endif
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, MAYBE_WindowActivation) {
   int item_count = launcher_->model()->item_count();
 
   // First run app.
-  const Extension* extension1 = LoadPlatformApp("launch");
+  const Extension* extension1 = LoadAndLaunchPlatformApp("launch");
   ShellWindow* window1 = CreateShellWindow(extension1);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item1 =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   // Then run second app.
-  const Extension* extension2 = LoadPlatformApp("launch_2");
+  const Extension* extension2 = LoadAndLaunchPlatformApp("launch_2");
   ShellWindow* window2 = CreateShellWindow(extension2);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item2 =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID item_id2 = item2.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item2.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item2.status);
 
   EXPECT_NE(item_id1, item_id2);
@@ skipping 48 matching lines @@
   --item_count;
   EXPECT_EQ(item_count, launcher_->model()->item_count());
   // First app should be active again.
   EXPECT_EQ(ash::STATUS_ACTIVE, launcher_->model()->ItemByID(item_id1)->status);
 
   // Close first app.
   CloseShellWindow(window1b);
   CloseShellWindow(window1);
   --item_count;
   EXPECT_EQ(item_count, launcher_->model()->item_count());
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, BrowserActivation) {
   int item_count = launcher_->model()->item_count();
 
   // First run app.
-  const Extension* extension1 = LoadPlatformApp("launch");
+  const Extension* extension1 = LoadAndLaunchPlatformApp("launch");
   CreateShellWindow(extension1);
   ++item_count;
   ASSERT_EQ(item_count, launcher_->model()->item_count());
   ash::LauncherItem item1 =
       launcher_->model()->items()[launcher_->model()->item_count() - 2];
   ash::LauncherID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_PLATFORM_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   ash::wm::ActivateWindow(browser()->window()->GetNativeWindow());
   EXPECT_EQ(ash::STATUS_RUNNING,
             launcher_->model()->ItemByID(item_id1)->status);
-  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Test that we can launch an app with a shortcut.
 IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, LaunchPinned) {
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   ash::LauncherID shortcut_id = CreateShortcut("app1");
   EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
   launcher_->ActivateLauncherItem(model_->ItemIndexByID(shortcut_id));
   EXPECT_EQ(++tab_count, tab_strip->count());
@@ skipping 266 matching lines @@
 
   // Activating app should launch new tab, because second tab isn't
   // in its refocus url path.
   launcher_->ActivateLauncherItem(model_->ItemIndexByID(shortcut_id));
   EXPECT_EQ(++tab_count, tab_strip->count());
   TabContents* second_tab = tab_strip->GetActiveTabContents();
   EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(shortcut_id)->status);
   EXPECT_NE(first_tab, second_tab);
   EXPECT_EQ(tab_strip->GetActiveTabContents(), second_tab);
 }