Merge 166715 - Revert r165772: Keep browser process alive while there are platform apps with backgr…

chrome/browser/extensions/extension_apitest.cc

Index: chrome/browser/extensions/extension_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_apitest.cc	(revision 166732)
+++ chrome/browser/extensions/extension_apitest.cc	(working copy)
@@ -6,8 +6,8 @@
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -173,13 +173,6 @@
 }
 
 bool ExtensionApiTest::RunPlatformAppTest(const char* extension_name) {
-  bool res = RunPlatformAppTestReturnImmediately(extension_name);
-  CloseShellWindowsAndWaitForAppToExit();
-  return res;
-}
-
-bool ExtensionApiTest::RunPlatformAppTestReturnImmediately(
-    const char* extension_name) {
   return RunExtensionTestImpl(extension_name, "", kFlagLaunchPlatformApp);
 }