Index: content/browser/media/webrtc_browsertest.cc |
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc |
index 1e435919a4f134303ad4cc2bc3c496c6c69a72d2..cd227dd4b51d89324fef255fe75e8226fa6bac27 100644 |
--- a/content/browser/media/webrtc_browsertest.cc |
+++ b/content/browser/media/webrtc_browsertest.cc |
@@ -114,7 +114,13 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { |
// This test will make a PeerConnection-based call and test an unreliable text |
// dataChannel and later add an audio and video track. |
-IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndLaterAddMedia) { |
+#if defined(OS_LINUX) |
+// Flaky on Linux. http://crbug.com/175683 |
+#define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia |
+#else |
+#define MAYBE_CallWithDataAndLaterAddMedia CallWithDataAndLaterAddMedia |
+#endif |
+IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) { |
GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); |
NavigateToURL(shell(), url); |