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

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

Change r165772 broke logout on official Chrome OS, such that Chrome
crashes every time you log out. This was caught by our bots which
immediately started failing every time, starting with r165772.

I tested this change on Chrome OS bots and confirmed that the
Chrome OS bots were fixed.

TBR=benwells@chromium.org
BUG=chromium:155457, chromium-os:36058
TEST=Run Chrome and Chrome OS trybots on several architectures. Verify
Chrome OS build is reliable now and that all Chrome browser tests still
pass.

Original CL description:

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.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=166715

[davidjames, 2012-11-08 08:03:44]

This has been confirmed to make Chrome work on Chrome OS again. See
http://chromegw.corp.google.com/i/chromiumos.tryserver/builders/lumpy-tot-chr...

[Peter Mayo, 2012-11-08 14:53:52]

Original review was here:

https://chromiumcodereview.appspot.com/11117011/

[Nikita (slow), 2012-11-08 15:37:30]

sheriff rubberstamp lgtm

[DaveMoore, 2012-11-08 15:59:36]

On 2012/11/08 15:37:30, Nikita Kostylev wrote:
> sheriff rubberstamp lgtm

Please do not check this in until we have a conversation with the writers of the
original cl.

[DaveMoore, 2012-11-08 16:56:35]

Spoke to aa and he said to go ahead and revert.

On 2012/11/08 15:59:36, DaveMoore wrote:
> On 2012/11/08 15:37:30, Nikita Kostylev wrote:
> > sheriff rubberstamp lgtm
> 
> Please do not check this in until we have a conversation with the writers of
the
> original cl.

[davidjames, 2012-11-08 17:38:47]

For folks reviewing this later, a few comments on how I resolved the conflicts

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
File chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
(right):

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc:44:
IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, DISABLED_DeleteFileSystem) {
This test depends on r165772, so I had to disable it. Updating the below code to
run 'RunExtensionTest' wasn't enough (trybots failed with that) so I just
disabled the test.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
File chrome/browser/extensions/platform_app_browsertest.cc (left):

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:13: #include
"chrome/browser/lifetime/application_lifetime.h"
There was a trivial conflict here in the context of the patch, which was easy to
resolve (I just manually applied the same change, deleting this line.)

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:762:
CloseShellWindowsAndWaitForAppToExit();
The CL I reverted added the CloseShellWindowsAndWaitForAppToExit API and added
CloseShellWindowsAndWaitForAppToExit() calls at the bottom of a bunch of tests.
This call was added in a subsequent CL, but still needs to be removed, so I
removed it.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:805:
CloseShellWindowsAndWaitForAppToExit();
Same here. The CL I reverted added the CloseShellWindowsAndWaitForAppToExit API
and added CloseShellWindowsAndWaitForAppToExit() calls at the bottom of a bunch
of tests. This call was added in a subsequent CL, but still needs to be removed,
so I removed it.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:814:
application_launch::OpenApplication(application_launch::LaunchParams(
The CL I reverted added the LoadPlatformApp API. I'm guessing that now that
we're switching back to LoadAndLaunchPlatformApp, we don't need to run this
OpenApplication call anymore?

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:825:
CloseShellWindowsAndWaitForAppToExit();
The CL I reverted added the CloseShellWindowsAndWaitForAppToExit API and added
CloseShellWindowsAndWaitForAppToExit() calls at the bottom of a bunch of tests.
This call was added in a subsequent CL, but still needs to be removed, so I
removed it.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
File chrome/browser/extensions/platform_app_browsertest.cc (right):

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:724:
ExtensionTestMessageListener launched_listener("Launched", false);
I added this line because we need to wait for the application to launch before
looking for the shell window.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/platform_app_browsertest.cc:727:
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
Same here.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
File chrome/browser/extensions/web_view_browsertest.cc (left):

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/web_view_browsertest.cc:209:
CloseShellWindowsAndWaitForAppToExit();
The original CL had trivial conflicts on this line, which I resolved easily.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/web_view_browsertest.cc:299:
CloseShellWindowsAndWaitForAppToExit();
The CL I reverted added the CloseShellWindowsAndWaitForAppToExit API and added
CloseShellWindowsAndWaitForAppToExit() calls at the bottom of a bunch of tests.
This call was added in a subsequent CL, but still needs to be removed, so I
removed it.

https://chromiumcodereview.appspot.com/11275209/diff/7017/chrome/browser/exte...
chrome/browser/extensions/web_view_browsertest.cc:387:
CloseShellWindowsAndWaitForAppToExit();
The CL I reverted added the CloseShellWindowsAndWaitForAppToExit API and added
CloseShellWindowsAndWaitForAppToExit() calls at the bottom of a bunch of tests.
This call was added in a subsequent CL, but still needs to be removed, so I
removed it.

[commit-bot: I haz the power, 2012-11-08 18:06:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/davidjames@chromium.org/11275209/7017

[benwells, 2012-11-09 23:54:06]

lgtm