Disable deadlock-y tests in TSan instead of just suppressing the error.

The tests actually deadlock in practice.

BUG=407452
TBR=xhwang@chromium.org

Review URL: https://codereview.chromium.org/507163002

Cr-Commit-Position: refs/heads/master@{#292046}

build/sanitizers/tsan_suppressions.cc

@@ -302,9 +302,6 @@ char kTSanDefaultSuppressions[] =
 "deadlock:"
 "base::debug::TraceEventTestFixture_ThreadOnceBlocking_Test::TestBody\n"
 
-// http://crbug.com/407452
-"deadlock:media::Pipeline::GetMediaTime\n"
-
 // End of suppressions.
 ;  // Please keep this semicolon.
 

content/browser/media/encrypted_media_browsertest.cc

@@ -18,7 +18,9 @@ const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
 
 // Supported media types.
 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
+#if !defined(THREAD_SANITIZER)
 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
+#endif  // !defined(THREAD_SANITIZER)
 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
 
 // EME-specific test results and errors.
@@ -146,6 +148,8 @@ INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
 INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest,
                         Combine(Values(kClearKeyKeySystem), Values(MSE)));
 
+// http://crbug.com/407452
+#if !defined(THREAD_SANITIZER)
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
   TestSimplePlayback("bear-a_enc-a.webm", kWebMAudioOnly);
 }
@@ -169,6 +173,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
   TestConfigChange();
 }
+#endif  // !defined(THREAD_SANITIZER)
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
   // Times out on Windows XP. http://crbug.com/171937

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);

content/browser/media/media_source_browsertest.cc

@@ -10,12 +10,14 @@
 #endif
 
 // Common media types.
+#if !defined(THREAD_SANITIZER)
 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
 #if !defined(OS_ANDROID)
 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
 #endif
 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
+#endif  // !defined(THREAD_SANITIZER)
 
 namespace content {
 
@@ -55,6 +57,8 @@ class MediaSourceTest : public content::MediaBrowserTest {
 #endif
 };
 
+// http://crbug.com/407452
+#if !defined(THREAD_SANITIZER)
 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) {
   TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded);
 }
@@ -90,5 +94,6 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
                    kEnded,
                    true);
 }
+#endif  // !defined(THREAD_SANITIZER)
 
 }  // namespace content

media/filters/pipeline_integration_test.cc

@@ -1425,6 +1425,8 @@ TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {
                                  0x10CA, 19730));
 }
 
+// http://crbug.com/407452
+#if !defined(THREAD_SANITIZER)
 // Verify video decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
   ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM,
@@ -1433,6 +1435,7 @@ TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
                                  base::TimeDelta::FromMilliseconds(1668),
                                  0x1C896, 65536));
 }
+#endif  // !defined(THREAD_SANITIZER)
 
 // Verify that Opus audio in WebM containers can be played back.
 TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) {