summaryrefslogtreecommitdiffstats
path: root/content/browser/debugger
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 15:06:00 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 15:06:00 +0000
commitba27aefa1ab3f9821355e5e5836a907e4c4ca415 (patch)
treeff1df97d027fdee1d406952014549fa0375dad54 /content/browser/debugger
parenta5fcc64ea3af1203249ba30d895ef227e0e8cc15 (diff)
downloadchromium_src-ba27aefa1ab3f9821355e5e5836a907e4c4ca415.zip
chromium_src-ba27aefa1ab3f9821355e5e5836a907e4c4ca415.tar.gz
chromium_src-ba27aefa1ab3f9821355e5e5836a907e4c4ca415.tar.bz2
Add Linux to list of platforms DevToolsHttpHandlerTest.TestStartStop
is flaky on. TBR=mnaganov@chromium.org BUG=161027 Review URL: https://chromiumcodereview.appspot.com/11348223 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger')
-rw-r--r--content/browser/debugger/devtools_http_handler_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/debugger/devtools_http_handler_unittest.cc b/content/browser/debugger/devtools_http_handler_unittest.cc
index 7d88c1f..af506c8 100644
--- a/content/browser/debugger/devtools_http_handler_unittest.cc
+++ b/content/browser/debugger/devtools_http_handler_unittest.cc
@@ -84,8 +84,9 @@ class DevToolsHttpHandlerTest : public testing::Test {
scoped_ptr<BrowserThreadImpl> file_thread_;
};
-// Sometimes, an assertion fails in NotificationRegistrar. http://crbug.com/161027
-#if defined(OS_ANDROID)
+// Sometimes, an assertion fails in NotificationRegistrar.
+// http://crbug.com/161027
+#if defined(OS_ANDROID) || defined(OS_LINUX)
#define MAYBE_TestStartStop DISABLED_TestStartStop
#else
#define MAYBE_TestStartStop TestStartStop