Index: content/browser/media/encrypted_media_browsertest.cc |
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc |
index c049d307cad0ed660ae081b4a75ee91734582dfc..338fa35aef427635116f97c1bdb0555cfcce2784 100644 |
--- a/content/browser/media/encrypted_media_browsertest.cc |
+++ b/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 |