Revert of media: Use platform specific folders for CDMs

chrome/browser/media/pepper_cdm_test_helper.h

Index: chrome/browser/media/pepper_cdm_test_helper.h
diff --git a/chrome/browser/media/pepper_cdm_test_helper.h b/chrome/browser/media/pepper_cdm_test_helper.h
index 87e766ff7b006f49fd1ddd957b9cb37fe4581062..d5ff9b4de461d987d6e4857e3ade64ebf7a2dce4 100644
--- a/chrome/browser/media/pepper_cdm_test_helper.h
+++ b/chrome/browser/media/pepper_cdm_test_helper.h
@@ -13,14 +13,11 @@
 class CommandLine;
 }
 
-// Base path for Clear Key CDM (relative to the chrome executable).
-extern const char kClearKeyCdmBaseDirectory[];
+// Display name for Clear Key CDM.
+extern const char kClearKeyCdmDisplayName[];
 
 // Platform-specific filename relative to kClearKeyCdmBaseDirectory.
 extern const char kClearKeyCdmAdapterFileName[];
-
-// Display name for Clear Key CDM.
-extern const char kClearKeyCdmDisplayName[];
 
 // Pepper type for Clear Key CDM.
 extern const char kClearKeyCdmPepperMimeType[];
@@ -30,7 +27,6 @@
 // Multiple results may be passed to kRegisterPepperPlugins, separated by ",".
 // The CDM adapter should be located in DIR_MODULE.
 base::FilePath::StringType BuildPepperCdmRegistration(
-    const std::string& adapter_base_dir,
     const std::string& adapter_file_name,
     const std::string& display_name,
     const std::string& mime_type,
@@ -38,7 +34,6 @@
 
 // Registers pepper CDM in |command_line|.
 void RegisterPepperCdm(base::CommandLine* command_line,
-                       const std::string& adapter_base_dir,
                        const std::string& adapter_file_name,
                        const std::string& display_name,
                        const std::string& mime_type,