(reland) media: Use platform specific folders for CDMs

chrome/browser/media/pepper_cdm_test_helper.cc

Index: chrome/browser/media/pepper_cdm_test_helper.cc
diff --git a/chrome/browser/media/pepper_cdm_test_helper.cc b/chrome/browser/media/pepper_cdm_test_helper.cc
index 107310813679977340f35515d013708e48ace19c..b4b85dfa0bcec48e8224c3138ab5910d4120679f 100644
--- a/chrome/browser/media/pepper_cdm_test_helper.cc
+++ b/chrome/browser/media/pepper_cdm_test_helper.cc
@@ -9,10 +9,11 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_switches.h"
+#include "media/cdm/cdm_paths.h"
 
 #include "widevine_cdm_version.h"  //  In SHARED_INTERMEDIATE_DIR.
 
-const char kClearKeyCdmDisplayName[] = "Clear Key CDM";
+const char kClearKeyCdmBaseDirectory[] = "ClearKeyCdm";
 
 const char kClearKeyCdmAdapterFileName[] =
 #if defined(OS_MACOSX)
@@ -23,17 +24,23 @@ const char kClearKeyCdmAdapterFileName[] =
     "libclearkeycdmadapter.so";
 #endif
 
+const char kClearKeyCdmDisplayName[] = "Clear Key CDM";
+
 const char kClearKeyCdmPepperMimeType[] = "application/x-ppapi-clearkey-cdm";
 
 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,
     bool expect_adapter_exists) {
   base::FilePath adapter_path;
   PathService::Get(base::DIR_MODULE, &adapter_path);
+  adapter_path = adapter_path.Append(
+      media::GetPlatformSpecificDirectory(adapter_base_dir));
   adapter_path = adapter_path.AppendASCII(adapter_file_name);
-  DCHECK_EQ(expect_adapter_exists, base::PathExists(adapter_path));
+  DCHECK_EQ(expect_adapter_exists, base::PathExists(adapter_path))
+      << adapter_path.MaybeAsASCII();
 
   base::FilePath::StringType pepper_cdm_registration = adapter_path.value();
 
@@ -52,12 +59,14 @@ base::FilePath::StringType BuildPepperCdmRegistration(
 }
 
 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,
                        bool expect_adapter_exists) {
   base::FilePath::StringType pepper_cdm_registration =
-      BuildPepperCdmRegistration(adapter_file_name, display_name, mime_type,
+      BuildPepperCdmRegistration(adapter_base_dir, adapter_file_name,
+                                 display_name, mime_type,
                                  expect_adapter_exists);
 
   // Append the switch to register the CDM Adapter.