media: Move widevine CDM targets to WidevineCdm folder

chrome/browser/content_settings/content_settings_browsertest.cc

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 7af3c5dfb73abf1163eb9239a775cbdedca78489..c223554a408018a17c406659b44884eb5c721484 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -336,14 +336,13 @@ 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);
+        "", kLibraryName, "Clear Key CDM", kExternalClearKeyMimeType);
 #if defined(WIDEVINE_CDM_AVAILABLE) && 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));
+    pepper_plugins.append(BuildPepperPluginRegistration(
+        kWidevineCdmBaseDirectory, kWidevineCdmAdapterFileName,
+        kWidevineCdmDisplayName, kWidevineCdmPluginMimeType));
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
     command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
                                      pepper_plugins);
@@ -435,11 +434,13 @@ class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest {
   // plugin using the provided parameters and a dummy version.
   // Multiple results may be passed to kRegisterPepperPlugins, separated by ",".
   base::FilePath::StringType BuildPepperPluginRegistration(
+      const char* library_path,
       const char* library_name,
       const char* display_name,
       const char* mime_type) {
     base::FilePath plugin_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &plugin_dir));
+    plugin_dir = plugin_dir.AppendASCII(library_path);
 
     base::FilePath plugin_lib = plugin_dir.AppendASCII(library_name);
     EXPECT_TRUE(base::PathExists(plugin_lib));