Conditionally build support for Pepper-based CDMs.

content/browser/media/encrypted_media_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/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/media_switches.h"
 #include "webkit/media/crypto/key_systems.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX)
 #include <gnu/libc-version.h>
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(OS_LINUX)
 
+#if defined(ENABLE_PEPPER_CDMS)
 // Platform-specific filename relative to the chrome executable.
-#if defined(OS_WIN)
-static const char kClearKeyLibraryName[] = "clearkeycdmadapter.dll";
-static const char kWidevineLibraryName[] = "widevinecdmadapter.dll";
-#elif defined(OS_MACOSX)
-static const char kClearKeyLibraryName[] = "clearkeycdmadapter.plugin";
-static const char kWidevineLibraryName[] = "widevinecdmadapter.plugin";
+static const base::FilePath::CharType kClearKeyCdmAdapterFileName[] =
+#if defined(OS_MACOSX)
+    FILE_PATH_LITERAL("clearkeycdmadapter.plugin");
+#elif defined(OS_WIN)
+    FILE_PATH_LITERAL("clearkeycdmadapter.dll");
 #elif defined(OS_POSIX)
-static const char kClearKeyLibraryName[] = "libclearkeycdmadapter.so";
-static const char kWidevineLibraryName[] = "libwidevinecdmadapter.so";
+    FILE_PATH_LITERAL("libclearkeycdmadapter.so");
 #endif
+#endif  // defined(ENABLE_PEPPER_CDMS)
 
 // Available key systems.
 static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
 static const char kExternalClearKeyKeySystem[] =
     "org.chromium.externalclearkey";
 
 // Supported media types.
 static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
 static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
 static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
@@ skipping 47 matching lines @@
       std::string fail_message;
       EXPECT_TRUE(ExecuteScriptAndExtractString(
           shell()->web_contents(),
           "window.domAutomationController.send(failMessage);",
           &fail_message));
       LOG(INFO) << "Test failed: " << fail_message;
     }
   }
 
  protected:
-  // Registers any CDM plugins not registered by default.
+#if defined(ENABLE_PEPPER_CDMS)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    RegisterPepperPlugin(command_line, kClearKeyLibraryName,
-                         kExternalClearKeyKeySystem);
+    RegisterPepperCdm(command_line, kClearKeyCdmAdapterFileName,
+                      kExternalClearKeyKeySystem);
   }
 
-  virtual void RegisterPepperPlugin(CommandLine* command_line,
-                                    const std::string& library_name,
-                                    const std::string& key_system) {
+  virtual void RegisterPepperCdm(CommandLine* command_line,
+                                 const base::FilePath::StringType& adapter_name,
+                                 const std::string& key_system) {
     // Append the switch to register the Clear Key CDM Adapter.
     base::FilePath plugin_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir));
-#if defined(OS_WIN)
-    base::FilePath plugin_lib = plugin_dir.Append(ASCIIToWide(library_name));
-#else
-    base::FilePath plugin_lib = plugin_dir.Append(library_name);
-#endif
+    base::FilePath plugin_lib = plugin_dir.Append(adapter_name);
     EXPECT_TRUE(file_util::PathExists(plugin_lib));
     base::FilePath::StringType pepper_plugin = plugin_lib.value();
     pepper_plugin.append(FILE_PATH_LITERAL("#CDM#0.1.0.0;"));
 #if defined(OS_WIN)
-    pepper_plugin.append(ASCIIToWide(webkit_media::GetPluginType(key_system)));
+    pepper_plugin.append(ASCIIToWide(webkit_media::GetPepperType(key_system)));
 #else
-    pepper_plugin.append(webkit_media::GetPluginType(key_system));
+    pepper_plugin.append(webkit_media::GetPepperType(key_system));
 #endif
     command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
                                      pepper_plugin);
+#endif  // defined(ENABLE_PEPPER_CDMS)

[xhwang, 2013/05/14 16:35:44]

shouldn't this be after line 132?

[ddorwin, 2013/05/14 20:14:28]

Done. Fixed in Patch 5.

   }
 };
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 class WVEncryptedMediaTest : public EncryptedMediaTest {
  public:
   // Tests that the following happen after trying to play encrypted media:
   // - webkitneedkey event is fired.
   // - webkitGenerateKeyRequest() does not fail.
   // - webkitkeymessage is fired
@@ skipping 13 matching lines @@
                                            key_system, kExpectedWebKitError);
     bool receivedKeyMessage = false;
     EXPECT_TRUE(ExecuteScriptAndExtractBool(
         shell()->web_contents(),
         "window.domAutomationController.send(video.receivedKeyMessage);",
         &receivedKeyMessage));
     ASSERT_TRUE(receivedKeyMessage);
   }
 
  protected:
-  // Registers any CDM plugins not registered by default.
+#if defined(ENABLE_PEPPER_CDMS)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
-    RegisterPepperPlugin(command_line, kWidevineLibraryName,
-                         kWidevineKeySystem);
+    RegisterPepperCdm(command_line, kWidevineCdmAdapterFileName,
+                      kWidevineKeySystem);
   }
+#endif  // defined(ENABLE_PEPPER_CDMS)
 };
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest,
                         ::testing::Values(kClearKeyKeySystem));
 
+// External Clear Key is currently only used on platforms that use Pepper CDMs.
+#if defined(ENABLE_PEPPER_CDMS)
 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest,
                         ::testing::Values(kExternalClearKeyKeySystem));
+#endif

[xhwang, 2013/05/14 16:35:44]

nit: #endif  // defined(ENABLE_PEPPER_CDMS)

[ddorwin, 2013/05/14 20:14:28]

I believe the general pattern is to add a comment if there are nested ifdefs
and/or a long block of code between the #if and #endif. It's not an exact
science. In this case, the beginning and end are close together.

 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
   const string16 kExpected = ASCIIToUTF16(
       StringToUpperASCII(std::string("GenerateKeyRequestException")));
   TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo,
                      "com.example.invalid", kExpected);
 }
 
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
   TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, GetParam(),
@@ skipping 77 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) {
   TestSimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly,
                      kWidevineKeySystem);
 }
 #endif  // defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
 #endif  // !defined(DISABLE_WIDEVINE_CDM_BROWSERTESTS)
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 }  // namespace content