diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 22:21:00 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 22:21:00 +0000 |
| commit | b64ca684e8ecd045497eed9f1d36b86f40a8543b (patch) | |
| tree | ffa8f6f5321b49d42197b7286dc1017609eb3ee8 /chrome/browser/extensions/extension_apitest.cc | |
| parent | 49ba08935fc62229adb3fc5d83ddac832a3e1620 (diff) | |
| download | chromium_src-b64ca684e8ecd045497eed9f1d36b86f40a8543b.zip chromium_src-b64ca684e8ecd045497eed9f1d36b86f40a8543b.tar.gz chromium_src-b64ca684e8ecd045497eed9f1d36b86f40a8543b.tar.bz2 | |
Keep browser process alive while there are platform apps with background pages running.
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.
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.
Review URL: https://chromiumcodereview.appspot.com/11117011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index f70b3b1..698ae40 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -6,8 +6,8 @@ #include "base/string_util.h" #include "base/stringprintf.h" -#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/api/test/test_api.h" +#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -173,6 +173,13 @@ bool ExtensionApiTest::RunPageTest(const std::string& page_url, } 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); } |