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

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

Issue 1284083002: Print stack traces in child processes when browser tests failed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes 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
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 9081a83e383e120709726816d5b261b07ae19dce..1d934a96c0c1cc037969169c1faf0a8628b16d4b 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -532,7 +532,6 @@ INSTANTIATE_TEST_CASE_P(SRC_ClearKey,
Values(UNPREFIXED)));
#endif // !defined(OS_ANDROID)
-#if !defined(OS_WIN)
// Tests flaky on Win 7 dbg. http://crbug.com/517018
INSTANTIATE_TEST_CASE_P(MSE_ClearKey_Prefixed,
EncryptedMediaTest,
@@ -544,7 +543,6 @@ INSTANTIATE_TEST_CASE_P(MSE_ClearKey,
Combine(Values(kClearKeyKeySystem),
Values(MSE),
Values(UNPREFIXED)));
-#endif // !defined(OS_WIN)
// External Clear Key is currently only used on platforms that use Pepper CDMs.
#if defined(ENABLE_PEPPER_CDMS)
@@ -558,7 +556,7 @@ INSTANTIATE_TEST_CASE_P(SRC_ExternalClearKey,
Combine(Values(kExternalClearKeyKeySystem),
Values(SRC),
Values(UNPREFIXED)));
-#if !defined(OS_WIN)
+
const char kExternalClearKeyDecryptOnlyKeySystem[] =
"org.chromium.externalclearkey.decryptonly";
@@ -584,7 +582,6 @@ INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKeyDecryptOnly,
Combine(Values(kExternalClearKeyDecryptOnlyKeySystem),
Values(MSE),
Values(UNPREFIXED)));
-#endif // !defined(OS_WIN)
#endif // defined(ENABLE_PEPPER_CDMS)
#if defined(WIDEVINE_CDM_AVAILABLE)

Powered by Google App Engine
This is Rietveld 408576698