| 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 6d30b2f4cf32c9445cc76d8b3e4ddc6ff8d2888d..3b806884f7d50495eaf62a253c407a2fb6baa552 100644
|
| --- a/chrome/browser/load_library_perf_test.cc
|
| +++ b/chrome/browser/load_library_perf_test.cc
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| +#include "base/native_library.h"
|
| #include "base/path_service.h"
|
| #include "base/scoped_native_library.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -63,14 +64,7 @@ void MeasureSizeAndTimeToLoadNativeLibrary(
|
|
|
| // File name of the ClearKey CDM on different platforms.
|
| // TODO(xhwang): Consolidate this with external_clear_key_test_helper.cc.
|
| -const char kClearKeyCdmFileName[] =
|
| -#if defined(OS_MACOSX)
|
| - "libclearkeycdm.dylib";
|
| -#elif defined(OS_WIN)
|
| - "clearkeycdm.dll";
|
| -#else // OS_LINUX, etc.
|
| - "libclearkeycdm.so";
|
| -#endif
|
| +const char kClearKeyCdmName[] = "clearkeycdm";
|
|
|
| void MeasureSizeAndTimeToLoadCdm(const std::string& cdm_base_dir,
|
| const std::string& cdm_name) {
|
| @@ -86,7 +80,8 @@ void MeasureSizeAndTimeToLoadCdm(const std::string& cdm_base_dir,
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| #if defined(WIDEVINE_CDM_AVAILABLE)
|
| TEST(LoadCDMPerfTest, Widevine) {
|
| - MeasureSizeAndTimeToLoadCdm(kWidevineCdmBaseDirectory, kWidevineCdmFileName);
|
| + MeasureSizeAndTimeToLoadCdm(kWidevineCdmBaseDirectory,
|
| + base::GetNativeLibraryName(kWidevineCdmName));
|
| }
|
|
|
| TEST(LoadCDMPerfTest, WidevineAdapter) {
|
| @@ -96,7 +91,8 @@ TEST(LoadCDMPerfTest, WidevineAdapter) {
|
| #endif // defined(WIDEVINE_CDM_AVAILABLE)
|
|
|
| TEST(LoadCDMPerfTest, ExternalClearKey) {
|
| - MeasureSizeAndTimeToLoadCdm(kClearKeyCdmBaseDirectory, kClearKeyCdmFileName);
|
| + MeasureSizeAndTimeToLoadCdm(kClearKeyCdmBaseDirectory,
|
| + base::GetNativeLibraryName(kClearKeyCdmName));
|
| }
|
|
|
| TEST(LoadCDMPerfTest, ExternalClearKeyAdapter) {
|
|
|