summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 19:26:51 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 19:26:51 +0000
commiteb49115585938ca892f11e9bb922546ccc456a75 (patch)
treea747f3dc74b261ee47dda7c2b8563477b74c4388 /content
parent728b7eff5801c696bd5b4c00f7618c15c9c3a102 (diff)
downloadchromium_src-eb49115585938ca892f11e9bb922546ccc456a75.zip
chromium_src-eb49115585938ca892f11e9bb922546ccc456a75.tar.gz
chromium_src-eb49115585938ca892f11e9bb922546ccc456a75.tar.bz2
Disable ServiceWorkerBlackBoxBrowserTest.Registration on Android.
This test is crashing frequently. BUG=387045 TBR=michaeln@chromium.org Review URL: https://codereview.chromium.org/341193003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/service_worker/service_worker_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 97ff8f0..8e5b887 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -612,7 +612,13 @@ static int CountRenderProcessHosts() {
return result;
}
-IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, Registration) {
+// Crashes on Android: http://crbug.com/387045
+#if defined(OS_ANDROID)
+#define MAYBE_Registration DISABLED_Registration
+#else
+#define MAYBE_Registration Registration
+#endif
+IN_PROC_BROWSER_TEST_F(ServiceWorkerBlackBoxBrowserTest, MAYBE_Registration) {
// Close the only window to be sure we're not re-using its RenderProcessHost.
shell()->Close();
EXPECT_EQ(0, CountRenderProcessHosts());