| Index: chrome/browser/content_settings/content_settings_browsertest.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
|
| index 7952ee9a007a19b800603b57515f369c52eecf14..e8a30badfa8ddb2940693831471202201b36f1a4 100644
|
| --- a/chrome/browser/content_settings/content_settings_browsertest.cc
|
| +++ b/chrome/browser/content_settings/content_settings_browsertest.cc
|
| @@ -486,14 +486,14 @@ class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest {
|
| // Append the switch to register the External Clear Key CDM.
|
| base::FilePath::StringType pepper_plugins = BuildPepperPluginRegistration(
|
| kLibraryName, "Clear Key CDM", kExternalClearKeyMimeType);
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#if defined(ENABLE_WIDEVINE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| // The CDM must be registered when it is a component.
|
| pepper_plugins.append(FILE_PATH_LITERAL(","));
|
| pepper_plugins.append(
|
| BuildPepperPluginRegistration(kWidevineCdmAdapterFileName,
|
| kWidevineCdmDisplayName,
|
| kWidevineCdmPluginMimeType));
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#endif // defined(ENABLE_WIDEVINE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
|
| pepper_plugins);
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
| @@ -666,7 +666,7 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
|
| RunLoadPepperPluginTest(kExternalClearKeyMimeType, false);
|
| }
|
|
|
| -#if defined(WIDEVINE_CDM_AVAILABLE)
|
| +#if defined(ENABLE_WIDEVINE)
|
| IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
|
| WidevineCdm) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| @@ -676,7 +676,7 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
|
| #endif
|
| RunLoadPepperPluginTest(kWidevineCdmPluginMimeType, true);
|
| }
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
| +#endif // defined(ENABLE_WIDEVINE)
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| #if !defined(DISABLE_NACL)
|
| @@ -706,7 +706,7 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
|
| RunJavaScriptBlockedTest("load_clearkey_no_js.html", false);
|
| }
|
|
|
| -#if defined(WIDEVINE_CDM_AVAILABLE)
|
| +#if defined(ENABLE_WIDEVINE)
|
| IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
|
| WidevineCdm) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| @@ -716,7 +716,7 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
|
| #endif
|
| RunJavaScriptBlockedTest("load_widevine_no_js.html", true);
|
| }
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
| +#endif // defined(ENABLE_WIDEVINE)
|
| #endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| #if !defined(DISABLE_NACL)
|
|
|