| Index: chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| index 5e46ac98abf4d97c69bbaa73ce8faa9c9e0e7184..229beafa3b5cbfc7738b64ef81fbee26bf88d12e 100644
|
| --- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| @@ -47,19 +47,19 @@
|
| // RegisterPepperCdm() cannot set the codecs.
|
| // TODO(ddorwin): Enable these tests after we have the ability to use the CUS
|
| // in these tests. See http://crbug.com/356833.
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && !defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#if defined(ENABLE_WIDEVINE_CDM) && !defined(WIDEVINE_CDM_IS_COMPONENT)
|
| #define EXPECT_WV EXPECT_TRUE
|
| #define EXPECT_WVMP4 EXPECT_TRUE
|
| #define EXPECT_WVAAC EXPECT_TRUE
|
| #define EXPECT_WVAVC1 EXPECT_TRUE
|
| #define EXPECT_WVAVC1AAC EXPECT_TRUE
|
| -#else // defined(WIDEVINE_CDM_AVAILABLE) && !defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#else // defined(ENABLE_WIDEVINE_CDM) && !defined(WIDEVINE_CDM_IS_COMPONENT)
|
| #define EXPECT_WV EXPECT_FALSE
|
| #define EXPECT_WVMP4 EXPECT_FALSE
|
| #define EXPECT_WVAAC EXPECT_FALSE
|
| #define EXPECT_WVAVC1 EXPECT_FALSE
|
| #define EXPECT_WVAVC1AAC EXPECT_FALSE
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) &&
|
| +#endif // defined(ENABLE_WIDEVINE_CDM) &&
|
| // !defined(WIDEVINE_CDM_IS_COMPONENT)
|
|
|
| namespace chrome {
|
| @@ -1121,7 +1121,7 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaIsTypeSupportedTest,
|
|
|
| // This will fail in all builds unless widevine is available but not a
|
| // component, in which case it is registered internally
|
| -#if !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#if !defined(ENABLE_WIDEVINE_CDM) || defined(WIDEVINE_CDM_IS_COMPONENT)
|
| EXPECT_FALSE(IsConcreteSupportedKeySystem(kWidevineAlpha));
|
| EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
|
| "video/webm", no_codecs(), kWidevineAlpha));
|
| @@ -1162,7 +1162,7 @@ IN_PROC_BROWSER_TEST_F(
|
| // This will fail in all builds unless Widevine is available but not a
|
| // component, in which case it is registered internally.
|
| // TODO(xhwang): Define EXPECT_WV and run this test in all cases.
|
| -#if !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#if !defined(ENABLE_WIDEVINE_CDM) || defined(WIDEVINE_CDM_IS_COMPONENT)
|
| IN_PROC_BROWSER_TEST_F(
|
| EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest,
|
| PepperCDMsRegisteredButAdapterNotPresent) {
|
| @@ -1170,7 +1170,7 @@ IN_PROC_BROWSER_TEST_F(
|
| EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
|
| "video/webm", no_codecs(), kWidevineAlpha));
|
| }
|
| -#endif // !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#endif // !defined(ENABLE_WIDEVINE_CDM) || defined(WIDEVINE_CDM_IS_COMPONENT)
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| } // namespace chrome
|
|
|