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