Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
index 8d52332152db66ae037595c36f019f23ffdfaa1f..aac20562908b08adcfafe02fbc14f94e8fa71fdf 100644 |
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
@@ -12,7 +12,8 @@ |
#include "base/numerics/safe_conversions.h" |
#include "base/path_service.h" |
#include "base/strings/string_util.h" |
-#include "base/strings/utf_string_conversions.h" |
+#include "base/strings/utf_string_conversions.h" |
+#include "base/test/test_timeouts.h" |
#include "base/values.h" |
#include "build/build_config.h" |
#include "chrome/browser/apps/app_browsertest_util.h" |
@@ -29,6 +30,7 @@ |
#include "content/public/browser/web_contents.h" |
#include "content/public/test/test_utils.h" |
#include "extensions/browser/extension_system.h" |
+#include "extensions/browser/process_manager.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/extension.h" |
#include "extensions/test/result_catcher.h" |
@@ -78,6 +80,11 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { |
void SetUpOnMainThread() override { |
PlatformAppBrowserTest::SetUpOnMainThread(); |
ensure_media_directories_exists_.reset(new EnsureMediaDirectoriesExists); |
+ // Prevent the ProcessManager from suspending the chrome-test app. Needed |
+ // because the writer.onerror and writer.onwriteend events do not qualify as |
+ // pending callbacks, so the app looks dormant. |
+ extensions::ProcessManager::SetEventPageIdleTimeForTesting( |
+ TestTimeouts::action_max_timeout().InMilliseconds()); |
int64_t file_size; |
ASSERT_TRUE(base::GetFileSize(GetCommonDataDir().AppendASCII("test.jpg"), |