Index: content/browser/media/webrtc_browsertest.cc |
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc |
index 3176f5c3b19c35b0ccd1ec61a66b9bdb305e29ef..1dca109774a1dbf71c7005c83655d1de25cc320a 100644 |
--- a/content/browser/media/webrtc_browsertest.cc |
+++ b/content/browser/media/webrtc_browsertest.cc |
@@ -268,7 +268,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CallWithDataOnly) { |
MakeTypicalPeerConnectionCall("callWithDataOnly();"); |
} |
-IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CallWithSctpDataOnly) { |
+#if defined(MEMORY_SANITIZER) |
+// Fails under MemorySanitizer: http://crbug.com/405951 |
+#define MAYBE_CallWithSctpDataOnly DISABLED_CallWithSctpDataOnly |
+#else |
+#define MAYBE_CallWithSctpDataOnly CallWithSctpDataOnly |
+#endif |
+IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CallWithSctpDataOnly) { |
MakeTypicalPeerConnectionCall("callWithSctpDataOnly();"); |
} |
@@ -287,8 +293,10 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, DISABLED_CallWithDataAndMedia) { |
} |
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && \ |
+ defined(ARCH_CPU_ARM_FAMILY)) || defined(MEMORY_SANITIZER) |
// Timing out on ARM linux bot: http://crbug.com/238490 |
+// Fails under MemorySanitizer: http://crbug.com/405951 |
#define MAYBE_CallWithSctpDataAndMedia DISABLED_CallWithSctpDataAndMedia |
#else |
#define MAYBE_CallWithSctpDataAndMedia CallWithSctpDataAndMedia |