Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1643)

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 1275833002: Disable flaky EncryptedMediaTest tests on Windows which are blocking the commit queue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 76367c9b12eb19115b6125d3ba71f92ba317e674..14f8d3ed741272c1270c4b5af5a65eae57a4e9fe 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -534,7 +534,7 @@ INSTANTIATE_TEST_CASE_P(SRC_ClearKey,
Values(UNPREFIXED)));
#endif // !defined(OS_ANDROID)
-#if !defined(OS_WIN) || defined(NDEBUG)
+#if !defined(OS_WIN)
// Tests flaky on Win 7 dbg. http://crbug.com/517018
INSTANTIATE_TEST_CASE_P(MSE_ClearKey_Prefixed,
EncryptedMediaTest,
@@ -546,7 +546,7 @@ INSTANTIATE_TEST_CASE_P(MSE_ClearKey,
Combine(Values(kClearKeyKeySystem),
Values(MSE),
Values(UNPREFIXED)));
-#endif // !defined(OS_WIN) || defined(NDEBUG)
+#endif // !defined(OS_WIN)
// External Clear Key is currently only used on platforms that use Pepper CDMs.
#if defined(ENABLE_PEPPER_CDMS)
@@ -560,7 +560,7 @@ INSTANTIATE_TEST_CASE_P(SRC_ExternalClearKey,
Combine(Values(kExternalClearKeyKeySystem),
Values(SRC),
Values(UNPREFIXED)));
-#if !defined(OS_WIN) || defined(NDEBUG)
+#if !defined(OS_WIN)
// Tests flaky on Win 7 dbg. http://crbug.com/517018
INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKey_Prefixed,
EncryptedMediaTest,
@@ -583,7 +583,7 @@ INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKeyDecryptOnly,
Combine(Values(kExternalClearKeyDecryptOnlyKeySystem),
Values(MSE),
Values(UNPREFIXED)));
-#endif // !defined(OS_WIN) || defined(NDEBUG)
+#endif // !defined(OS_WIN)
#endif // defined(ENABLE_PEPPER_CDMS)
#if defined(WIDEVINE_CDM_AVAILABLE)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698