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

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

Issue 17198011: Wrap Pepper CDM Content Settings code in defined(ENABLE_PEPPER_CDMS). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_info_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3bb6c42f37d7c89e77bc4e913a8242eae787dcc2..857612cac2027df8170e17c64fe07a03383754a5 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -489,7 +489,7 @@ class PepperContentSettingsTest : public ContentSettingsTest {
const char kLibraryName[] = "clearkeycdmadapter.plugin";
#elif defined(OS_POSIX)
const char kLibraryName[] = "libclearkeycdmadapter.so";
-#endif
+#endif // defined(OS_MACOSX)
#endif // defined(OS_WIN)
// Append the switch to register the External Clear Key CDM.
@@ -571,7 +571,7 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsTest, PluginSpecialCases) {
#if defined(ENABLE_PEPPER_CDMS)
RunLoadPepperPluginTest(kExternalClearKeyMimeType, true);
-#endif
+#endif // defined(ENABLE_PEPPER_CDMS)
// Next, test behavior when plug-ins are blocked.
content_settings->SetDefaultContentSetting(
@@ -583,12 +583,12 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsTest, PluginSpecialCases) {
#if defined(WIDEVINE_CDM_AVAILABLE)
RunLoadPepperPluginTest(kWidevineCdmPluginMimeType, true);
-#endif
+#endif // defined(WIDEVINE_CDM_AVAILABLE)
#endif // defined(ENABLE_PEPPER_CDMS)
#if !defined(DISABLE_NACL)
RunLoadPepperPluginTest("application/x-nacl", true);
-#endif
+#endif // !defined(DISABLE_NACL)
// Finally, test behavior when (just) JavaScript is blocked.
content_settings->SetDefaultContentSetting(
@@ -602,12 +602,12 @@ IN_PROC_BROWSER_TEST_F(PepperContentSettingsTest, PluginSpecialCases) {
#if defined(WIDEVINE_CDM_AVAILABLE)
RunJavaScriptBlockedTest("load_widevine_no_js.html", true);
-#endif
+#endif // defined(WIDEVINE_CDM_AVAILABLE)
#endif // defined(ENABLE_PEPPER_CDMS)
#if !defined(DISABLE_NACL)
RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
-#endif
+#endif // !defined(DISABLE_NACL)
}
#endif // defined(ENABLE_PLUGINS)
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_info_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698