summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 03:47:04 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 03:47:04 +0000
commit65115a2b174256c67ae2a8c03f8937e46845d8c9 (patch)
tree763b504f1056caab7cb643c162df12e4218887a1 /chrome/browser/extensions
parent7a18eff35290c56707b91c0f4752ac1c356a4f65 (diff)
downloadchromium_src-65115a2b174256c67ae2a8c03f8937e46845d8c9.zip
chromium_src-65115a2b174256c67ae2a8c03f8937e46845d8c9.tar.gz
chromium_src-65115a2b174256c67ae2a8c03f8937e46845d8c9.tar.bz2
Disable flaky ExternallyConnectableMessagingTest.WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage on Linux altogether.
BUG=315264 TBR=juanlang@chromium.org,kalman@chromium.org,jam@chromium.org Review URL: https://codereview.chromium.org/66043004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_messages_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index d089204..e03e124 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -532,8 +532,8 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest,
EXPECT_EQ(std::string(), tls_channel_id);
}
-// Flaky on official Linux bot. http://crbug.com/315264
-#if defined(GOOGLE_CHROME_BUILD) && defined(OS_LINUX)
+// Flaky on Linux. http://crbug.com/315264
+#if defined(OS_LINUX)
#define MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage \
DISABLED_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage
#else