Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4057)

Unified Diff: chrome/browser/component_updater/widevine_cdm_component_installer.cc

Issue 2048523002: Fix base::GetNativeLibraryName() for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native_lib_clean
Patch Set: rebase Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/scoped_native_library_unittest.cc ('k') | chrome/browser/load_library_perf_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/widevine_cdm_component_installer.cc
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
index 0ab6467aacd3d6ce369110d438f3bab3ea52d654..e4f11e3d0c52cf175a412a1bfffe7ba4b4af57a9 100644
--- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
+++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -17,6 +17,7 @@
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/native_library.h"
#include "base/path_service.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
@@ -228,7 +229,8 @@ void RegisterWidevineCdmWithChrome(
// Also register Widevine with the CdmService.
const base::FilePath cdm_path =
- GetPlatformDirectory(cdm_install_dir).AppendASCII(kWidevineCdmFileName);
+ GetPlatformDirectory(cdm_install_dir)
+ .AppendASCII(base::GetNativeLibraryName(kWidevineCdmLibraryName));
const std::vector<std::string> supported_codecs = base::SplitString(
codecs, std::string(1, kCdmSupportedCodecsValueDelimiter),
base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
@@ -313,7 +315,8 @@ bool WidevineCdmComponentInstallerTraits::VerifyInstallation(
const base::FilePath& install_dir) const {
return IsCompatibleWithChrome(manifest) &&
base::PathExists(GetPlatformDirectory(install_dir)
- .AppendASCII(kWidevineCdmFileName));
+ .AppendASCII(base::GetNativeLibraryName(
+ kWidevineCdmLibraryName)));
}
// The base directory on Windows looks like:
« no previous file with comments | « base/scoped_native_library_unittest.cc ('k') | chrome/browser/load_library_perf_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698