summaryrefslogtreecommitdiffstats
path: root/chrome/browser/devtools
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 21:47:09 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 21:48:52 +0000
commit0be396927beaa06b4076a6b262500b223a138d7d (patch)
treedad920fb1ecf4fff1c4cffa0f9b0dbf4e2de1da5 /chrome/browser/devtools
parentcc3419c1c4d0cd4fe3cfcb7bfd6c79b31e4cab0d (diff)
downloadchromium_src-0be396927beaa06b4076a6b262500b223a138d7d.zip
chromium_src-0be396927beaa06b4076a6b262500b223a138d7d.tar.gz
chromium_src-0be396927beaa06b4076a6b262500b223a138d7d.tar.bz2
Disable WorkerDevToolsSanityTest.InspectSharedWorker everywhere. It also fails on CrOS.
BUG=403007 TBR=yurys@chromium.org Review URL: https://codereview.chromium.org/493203003 Cr-Commit-Position: refs/heads/master@{#291202} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
-rw-r--r--chrome/browser/devtools/devtools_sanity_browsertest.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 331d8fa..b7f444e 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -848,16 +848,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) {
CloseDevToolsWindow();
}
-#if defined(OS_MACOSX)
-#define MAYBE_InspectSharedWorker DISABLED_InspectSharedWorker
-#elif defined(OS_WIN)
-// Disabled on Windows due to flakiness. http://crbug.com/403007
-#define MAYBE_InspectSharedWorker DISABLED_InspectSharedWorker
-#else
-#define MAYBE_InspectSharedWorker InspectSharedWorker
-#endif
-// Flakily fails with 25s timeout: http://crbug.com/89845
-IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) {
+// Flakily fails: http://crbug.com/403007 http://crbug.com/89845
+IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, DISABLED_InspectSharedWorker) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))