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

Unified Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 772043004: Replace WIDEVINE_CDM_AVAILABLE with a gyp define 'enable_widevine_cdm'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix #endif Created 6 years 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/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..50952cc66c71fab2bb3e4b605d234649c3c8c08a 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_CDM) && 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_CDM) && 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_CDM)
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_CDM)
#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_CDM)
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_CDM)
#endif // defined(ENABLE_PEPPER_CDMS)
#if !defined(DISABLE_NACL)
« no previous file with comments | « chrome/browser/component_updater/widevine_cdm_component_installer.cc ('k') | chrome/browser/load_library_perf_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698