media: Move widevine CDM targets to WidevineCdm folder

media/cdm/external_clear_key_test_helper.cc

Index: media/cdm/external_clear_key_test_helper.cc
diff --git a/media/cdm/external_clear_key_test_helper.cc b/media/cdm/external_clear_key_test_helper.cc
index 1a2a15ea2ea7a93ad2cc5223e8e18866c8a7e603..ebdcf7e0435941e11a68c5635f6d17f4607d1d29 100644
--- a/media/cdm/external_clear_key_test_helper.cc
+++ b/media/cdm/external_clear_key_test_helper.cc
@@ -19,6 +19,8 @@ namespace media {
 #define STRINGIFY(X) #X
 #define MAKE_STRING(X) STRINGIFY(X)
 
+const char kClearKeyCdmBaseDirectory[] = "ClearKeyCdm";
+
 // File name of the External ClearKey CDM on different platforms.
 const base::FilePath::CharType kExternalClearKeyCdmFileName[] =
 #if defined(OS_MACOSX)
@@ -40,10 +42,10 @@ ExternalClearKeyTestHelper::~ExternalClearKeyTestHelper() {
 void ExternalClearKeyTestHelper::LoadLibrary() {
   // Determine the location of the CDM. It is expected to be in the same
   // directory as the current module.
-  base::FilePath current_module_dir;
-  ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &current_module_dir));
-  library_path_ =
-      current_module_dir.Append(base::FilePath(kExternalClearKeyCdmFileName));
+  base::FilePath library_dir;
+  ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &library_dir));
+  library_dir = library_dir.AppendASCII(kClearKeyCdmBaseDirectory);
+  library_path_ = library_dir.Append(kExternalClearKeyCdmFileName);
   ASSERT_TRUE(base::PathExists(library_path_)) << library_path_.value();
 
   // Now load the CDM library.