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

content/browser/media/media_source_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #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 {
 
 // MSE is available on all desktop platforms and on Android 4.1 and later.
 static bool IsMSESupported() {
 #if defined(OS_ANDROID)
   if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) {
     VLOG(0) << "MSE is only supported in Android 4.1 and later.";
     return false;
   }
@@ skipping 19 matching lines @@
   }
 
 #if defined(OS_ANDROID)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
   }
 #endif
 };
 
+// http://crbug.com/407452
+#if !defined(THREAD_SANITIZER)
 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) {
   TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoOnly_WebM) {
   TestSimplePlayback("bear-320x240-video-only.webm", kWebMVideoOnly, kEnded);
 }
 
 // Opus is not supported in Android as of now.
 #if !defined(OS_ANDROID)
@@ skipping 15 matching lines @@
 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
   if (!IsMSESupported()) {
     VLOG(0) << "Skipping test - MSE not supported.";
     return;
   }
   RunMediaTestPage("mse_config_change.html",
                    media::QueryParams(),
                    kEnded,
                    true);
 }
+#endif  // !defined(THREAD_SANITIZER)
 
 }  // namespace content