Revert of media: Move widevine CDM targets to WidevineCdm folder

chrome/browser/load_library_perf_test.cc

Index: chrome/browser/load_library_perf_test.cc
diff --git a/chrome/browser/load_library_perf_test.cc b/chrome/browser/load_library_perf_test.cc
index 0aa7f02e17a8d9de93aab24f770326bcfab1c5fd..5b4fe125709d5d136d0e78b2e267e49a927e52ec 100644
--- a/chrome/browser/load_library_perf_test.cc
+++ b/chrome/browser/load_library_perf_test.cc
@@ -16,22 +16,21 @@
 #include "testing/perf/perf_test.h"
 #include "widevine_cdm_version.h"  //  In SHARED_INTERMEDIATE_DIR.
 
-// Base path for Clear Key CDM (relative to the chrome executable).
-const char kClearKeyCdmBaseDirectory[] = "ClearKeyCdm";
-
 // Measures the size (bytes) and time to load (sec) of a native library.
-void MeasureSizeAndTimeToLoadNativeLibrary(const std::string& library_base_dir,
-                                           const std::string& library_name) {
+void MeasureSizeAndTimeToLoadNativeLibrary(const base::FilePath& library_name) {
   base::FilePath output_dir;
   ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &output_dir));
-  output_dir = output_dir.AppendASCII(library_base_dir);
-  base::FilePath library_path = output_dir.AppendASCII(library_name);
+  base::FilePath library_path = output_dir.Append(library_name);
   ASSERT_TRUE(base::PathExists(library_path)) << library_path.value();
 
   int64_t size = 0;
   ASSERT_TRUE(base::GetFileSize(library_path, &size));
-  perf_test::PrintResult("library_size", "", library_name,
-                         static_cast<size_t>(size), "bytes", true);
+  perf_test::PrintResult("library_size",
+                         "",
+                         library_name.AsUTF8Unsafe(),
+                         static_cast<size_t>(size),
+                         "bytes",
+                         true);
 
   base::NativeLibraryLoadError error;
   base::TimeTicks start = base::TimeTicks::Now();
@@ -40,50 +39,50 @@
   double delta = (base::TimeTicks::Now() - start).InMillisecondsF();
   ASSERT_TRUE(native_library) << "Error loading library: " << error.ToString();
   base::UnloadNativeLibrary(native_library);
-  perf_test::PrintResult("time_to_load_library", "", library_name, delta, "ms",
+  perf_test::PrintResult("time_to_load_library",
+                         "",
+                         library_name.AsUTF8Unsafe(),
+                         delta,
+                         "ms",
                          true);
 }
 
 // Use the base name of the library to dynamically get the platform specific
 // name. See base::GetNativeLibraryName() for details.
 void MeasureSizeAndTimeToLoadNativeLibraryByBaseName(
-    const std::string& library_base_dir,
     const std::string& base_library_name) {
-  MeasureSizeAndTimeToLoadNativeLibrary(
-      library_base_dir, base::UTF16ToUTF8(base::GetNativeLibraryName(
-                            base::ASCIIToUTF16(base_library_name))));
+  MeasureSizeAndTimeToLoadNativeLibrary(base::FilePath::FromUTF16Unsafe(
+      base::GetNativeLibraryName(base::ASCIIToUTF16(base_library_name))));
 }
 
 #if defined(ENABLE_PEPPER_CDMS)
 #if defined(WIDEVINE_CDM_AVAILABLE)
 TEST(LoadCDMPerfTest, Widevine) {
-  MeasureSizeAndTimeToLoadNativeLibrary(kWidevineCdmBaseDirectory,
-                                        kWidevineCdmFileName);
+  MeasureSizeAndTimeToLoadNativeLibrary(
+      base::FilePath::FromUTF8Unsafe(kWidevineCdmFileName));
 }
 
 TEST(LoadCDMPerfTest, WidevineAdapter) {
-  MeasureSizeAndTimeToLoadNativeLibrary(kWidevineCdmBaseDirectory,
-                                        kWidevineCdmAdapterFileName);
+  MeasureSizeAndTimeToLoadNativeLibrary(
+      base::FilePath::FromUTF8Unsafe(kWidevineCdmAdapterFileName));
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 
 TEST(LoadCDMPerfTest, ExternalClearKey) {
 #if defined(OS_MACOSX)
-  MeasureSizeAndTimeToLoadNativeLibrary(kClearKeyCdmBaseDirectory,
-                                        "libclearkeycdm.dylib");
+  MeasureSizeAndTimeToLoadNativeLibrary(
+    base::FilePath::FromUTF8Unsafe("libclearkeycdm.dylib"));
 #else
-  MeasureSizeAndTimeToLoadNativeLibraryByBaseName(kClearKeyCdmBaseDirectory,
-                                                  "clearkeycdm");
+  MeasureSizeAndTimeToLoadNativeLibraryByBaseName("clearkeycdm");
 #endif  // defined(OS_MACOSX)
 }
 
 TEST(LoadCDMPerfTest, ExternalClearKeyAdapter) {
 #if defined(OS_MACOSX)
-  MeasureSizeAndTimeToLoadNativeLibrary(kClearKeyCdmBaseDirectory,
-                                        "clearkeycdmadapter.plugin");
+  MeasureSizeAndTimeToLoadNativeLibrary(
+    base::FilePath::FromUTF8Unsafe("clearkeycdmadapter.plugin"));
 #else
-  MeasureSizeAndTimeToLoadNativeLibraryByBaseName(kClearKeyCdmBaseDirectory,
-                                                  "clearkeycdmadapter");
+  MeasureSizeAndTimeToLoadNativeLibraryByBaseName("clearkeycdmadapter");
 #endif  // defined(OS_MACOSX)
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)