Conditionally build support for Pepper-based CDMs.

chrome/browser/content_settings/content_settings_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 461 matching lines @@
   // Registers any CDM plugins not registered by default.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Platform-specific filename relative to the chrome executable.
 #if defined(OS_WIN)
     const wchar_t kLibraryName[] = L"clearkeycdmadapter.dll";
     const std::wstring external_clear_key_mime_type =
         ASCIIToWide(kExternalClearKeyMimeType);
 #else  // !defined(OS_WIN)
     const char* external_clear_key_mime_type = kExternalClearKeyMimeType;
 #if defined(OS_MACOSX)
     const char kLibraryName[] = "clearkeycdmadapter.plugin";

[xhwang, 2013/05/10 00:26:44]

Just double check: on systems that don't have ENABLE_PEPPER_CDMS, the still have
"plugin"s?

[ddorwin, 2013/05/14 00:17:10]

Done. I moved the ifdef up. Yes, plugin (ppapi & npapi) support is separate from
whether platforms use Pepper for CDMs. (Or, at least, the code allows that.)

 #elif defined(OS_POSIX)
     const char kLibraryName[] = "libclearkeycdmadapter.so";
 #endif
 #endif  // defined(OS_WIN)
 
+#if defined(ENABLE_PEPPER_CDMS)
     // Append the switch to register the External Clear Key CDM.
     base::FilePath plugin_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir));
     base::FilePath plugin_lib = plugin_dir.Append(kLibraryName);
     EXPECT_TRUE(file_util::PathExists(plugin_lib));
     base::FilePath::StringType pepper_plugin = plugin_lib.value();
     pepper_plugin.append(FILE_PATH_LITERAL(
         "#Clear Key CDM#Clear Key CDM 0.1.0.0#0.1.0.0;"));
     pepper_plugin.append(external_clear_key_mime_type);
     command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
                                      pepper_plugin);
+#endif  // defined(ENABLE_PEPPER_CDMS)
 #if !defined(DISABLE_NACL)
     // Ensure NaCl can run.
     command_line->AppendSwitch(switches::kEnableNaCl);
 #endif
   }
 
   void RunLoadPepperPluginTest(const char* mime_type, bool expect_loaded) {

[xhwang, 2013/05/10 00:26:44]

What about this and line 582?

[ddorwin, 2013/05/14 00:17:10]

It's used for a NaCl test. If NaCl and Pepper CDMs were disabled, we'd compile
some extra code in our tests. I don't think it's a big deal.

     const char* expected_result = expect_loaded ? "Loaded" : "Not Loaded";
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
     string16 expected_title(ASCIIToUTF16(expected_result));
     content::TitleWatcher title_watcher(web_contents, expected_title);
 
     // GetTestUrl assumes paths, so we must append query parameters to result.
     GURL file_url = ui_test_utils::GetTestUrl(
         base::FilePath(),
@@ skipping 37 matching lines @@
 
 // Tests Pepper plugins that use JavaScript instead of Plug-ins settings.
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsTest, PluginSpecialCases) {
   HostContentSettingsMap* content_settings =
       browser()->profile()->GetHostContentSettingsMap();
 
   // First, verify that this plugin can be loaded.
   content_settings->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ALLOW);
 
+#if defined(ENABLE_PEPPER_CDMS)
   RunLoadPepperPluginTest(kExternalClearKeyMimeType, true);
+#endif
 
   // Next, test behavior when plug-ins are blocked.
   content_settings->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
+#if defined(ENABLE_PEPPER_CDMS)
   // The plugin we loaded above does not load now.
   RunLoadPepperPluginTest(kExternalClearKeyMimeType, false);
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   RunLoadPepperPluginTest(kWidevineCdmPluginMimeType, true);
 #endif
+#endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
   RunLoadPepperPluginTest("application/x-nacl", true);
 #endif
 
   // Finally, test behavior when (just) JavaScript is blocked.
   content_settings->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ALLOW);
   content_settings->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
 
+#if defined(ENABLE_PEPPER_CDMS)
   // This plugin has no special behavior and does not require JavaScript.
   RunJavaScriptBlockedTest("load_clearkey_no_js.html", false);
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
   RunJavaScriptBlockedTest("load_widevine_no_js.html", true);
 #endif
+#endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
   RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
 #endif
 }
 
 #endif  // defined(ENABLE_PLUGINS)