Keep browser process alive while there are platform apps with background pages running.

chrome/browser/extensions/api/push_messaging/push_messaging_apitest.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/extensions/api/push_messaging/push_messaging_api.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 37 matching lines @@
 
   PushMessagingEventRouter* GetEventRouter() {
     return ExtensionSystem::Get(browser()->profile())->extension_service()->
         push_messaging_event_router();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
-  ExtensionTestMessageListener ready("ready", true);
+  ExtensionTestMessageListener ready("ready", false);
 
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
   ASSERT_TRUE(extension);
   extensions::LaunchPlatformApp(
       browser()->profile(), extension, NULL, FilePath());
   EXPECT_TRUE(ready.WaitUntilSatisfied());
 
   GetEventRouter()->TriggerMessageForTest(extension->id(), 1, "payload");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
+  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Test that a push introduced into the sync code makes it to the extension
 // that we install.
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, ReceivesPush) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
-  ExtensionTestMessageListener ready("ready", true);
+  ExtensionTestMessageListener ready("ready", false);
 
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
   ASSERT_TRUE(extension);
   extensions::LaunchPlatformApp(
       browser()->profile(), extension, NULL, FilePath());
   EXPECT_TRUE(ready.WaitUntilSatisfied());
 
   ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(
       browser()->profile());
   ASSERT_TRUE(pss);
 
   // Construct a sync id for the object "U/<extension-id>/1".
   std::string id = "U/";
   id += extension->id();
   id += "/1";
 
   invalidation::ObjectId object_id(kSourceId, id);
 
   pss->EmitInvalidationForTest(object_id, "payload");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
+  CloseShellWindowsAndWaitForAppToExit();
 }
 
 // Checks that an extension with the pushMessaging permission gets automatically
 // registered for invalidations when it is loaded.
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, AutoRegistration) {
   scoped_ptr<StrictMock<MockInvalidationMapper> > mapper(
       new StrictMock<MockInvalidationMapper>);
   StrictMock<MockInvalidationMapper>* unsafe_mapper = mapper.get();
   // PushMessagingEventRouter owns the mapper now.
   GetEventRouter()->SetMapperForTest(
@@ skipping 10 matching lines @@
   UnloadExtension(extension->id());
 }
 
 // Tests that we re-register for invalidations on restart for extensions that
 // are already installed.
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, PRE_Restart) {
   PushMessagingInvalidationHandler* handler =
       static_cast<PushMessagingInvalidationHandler*>(
           GetEventRouter()->GetMapperForTest());
   EXPECT_TRUE(handler->GetRegisteredExtensionsForTest().empty());
+  ExtensionTestMessageListener ready("ready", false);
   ASSERT_TRUE(InstallExtension(test_data_dir_.AppendASCII("push_messaging"),
                                1 /* new install */));
+  EXPECT_TRUE(ready.WaitUntilSatisfied());
+  CloseShellWindowsAndWaitForAppToExit();
 }
 
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, Restart) {
   PushMessagingInvalidationHandler* handler =
       static_cast<PushMessagingInvalidationHandler*>(
           GetEventRouter()->GetMapperForTest());
   EXPECT_EQ(1U, handler->GetRegisteredExtensionsForTest().size());
 }
 
 // Test the GetChannelId API.
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, GetChannelId) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("get_channel_id"));
   ASSERT_TRUE(extension);
   extensions::LaunchPlatformApp(
       browser()->profile(), extension, NULL, FilePath());
 
   // Just loading the page will cause a getChannelId call.
   // It should fail because no user is logged in.
 
   // Check the result of the test.
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
+  CloseShellWindowsAndWaitForAppToExit();
 }
 
 }  // namespace extensions