Index: content/browser/media/media_browsertest.cc |
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc |
index 0ffc029d80e1030f4def70163c0da87eeed79aee..1bc617c6db630b46021a04a7892605dd6deb3976 100644 |
--- a/content/browser/media/media_browsertest.cc |
+++ b/content/browser/media/media_browsertest.cc |
@@ -110,6 +110,8 @@ class MediaTest : public testing::WithParamInterface<bool>, |
} |
}; |
+// http://crbug.com/407452 |
+#if !defined(THREAD_SANITIZER) |
IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) { |
PlayVideo("bear.ogv", GetParam()); |
} |
@@ -234,10 +236,13 @@ IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { |
NavigateToURL(shell(), GURL(url::kAboutBlankURL)); |
EXPECT_FALSE(shell()->web_contents()->IsCrashed()); |
} |
+#endif // !defined(THREAD_SANITIZER) |
INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
+// http://crbug.com/407452 |
+#if !defined(THREAD_SANITIZER) |
IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) { |
RunColorFormatTest("yuv420p.ogv", kEnded); |
} |
@@ -258,6 +263,8 @@ IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) { |
RunColorFormatTest("yuv444p.webm", "ENDED"); |
} |
+#endif // !defined(THREAD_SANITIZER) |
+ |
#if defined(USE_PROPRIETARY_CODECS) |
IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { |
RunColorFormatTest("yuv420p.mp4", kEnded); |