Revert 170660

This change causes shutdown crashes when chrome menu is used to exit.

> Keep browser process alive while there are platform apps with background pages running. This does not happen on Android or ChromeOS builds: Android does not support browser process keep alive, and ChromeOS does not need or like it.
> 
> This change prevents platform apps getting killed unceremoniously while they have background pages active.
> 
> This also delays the process being shutdown after closing the last platform app window, as background pages are kept alive for 15 seconds after their last activity is completed.
> 
> This change re-lands r165772 which caused problems on Google branded ChromeOS. This version does not add keep alives for ChromeOS and was tested on the ChromeOS try bots.
> 
> TBR=davemoore@chromium.org for the ash launcher test change.
> 
> BUG=155457
> TEST=Make sure platform apps can be used from the launcher without chrome windows open; make sure Chrome shuts down properly in all cases.
> 
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165772
> 
> Review URL: https://chromiumcodereview.appspot.com/11117011

TBR=benwells@chromium.org
Review URL: https://codereview.chromium.org/11299326

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170891 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 7 deletions

diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index 2c5343f..143f9fd 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -148,15 +148,9 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   bool RunPageTest(const std::string& page_url, int flags);
 
   // Similar to RunExtensionTest, except used for running tests in platform app
-  // shell windows. After running the test will close all shell windows and wait
-  // for the background page to be unloaded.
+  // shell windows.
   bool RunPlatformAppTest(const char* extension_name);
 
-  // Similar to RunPlatformAppTest, except after running the test returns
-  // without closing shell windows or waiting for the background page to be
-  // unloaded.
-  bool RunPlatformAppTestReturnImmediately(const char* extension_name);
-
   // Start the test server, and store details of its state.  Those details
   // will be available to javascript tests using chrome.test.getConfig().
   bool StartTestServer();