| 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..3a6517c0dd8753779075f3a7afc334fc1fd68e6b 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(kWidevineCdmName));
|
| const std::vector<std::string> supported_codecs = base::SplitString(
|
| codecs, std::string(1, kCdmSupportedCodecsValueDelimiter),
|
| base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
|
| @@ -312,8 +314,9 @@ bool WidevineCdmComponentInstallerTraits::VerifyInstallation(
|
| const base::DictionaryValue& manifest,
|
| const base::FilePath& install_dir) const {
|
| return IsCompatibleWithChrome(manifest) &&
|
| - base::PathExists(GetPlatformDirectory(install_dir)
|
| - .AppendASCII(kWidevineCdmFileName));
|
| + base::PathExists(
|
| + GetPlatformDirectory(install_dir)
|
| + .AppendASCII(base::GetNativeLibraryName(kWidevineCdmName)));
|
| }
|
|
|
| // The base directory on Windows looks like:
|
|
|