Index: chrome/browser/extensions/extension_messages_apitest.cc |
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc |
index b47e8ea66e7970045643047b289f26f21e0f15ae..d089204f042b7e0df57971d92a0965fce01dd55e 100644 |
--- a/chrome/browser/extensions/extension_messages_apitest.cc |
+++ b/chrome/browser/extensions/extension_messages_apitest.cc |
@@ -532,10 +532,18 @@ 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) |
+#define MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage \ |
+ DISABLED_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage |
+#else |
+#define MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage \ |
+ WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage |
+#endif |
// Tests a web connectable extension that receives TLS channel id, but |
// immediately closes its background page upon receipt of a message. |
IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, |
- WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage) { |
+ MAYBE_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage) { |
InitializeTestServer(); |
const Extension* chromium_connectable = |