| 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 5598540eaeb5a9cfc1875f66d1c7b49030259b10..83723d2080cdfa916fdcceaac9e89b111d33f497 100644
|
| --- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
|
| +++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
|
| @@ -33,7 +33,7 @@
|
| #include "components/component_updater/default_component_installer.h"
|
| #include "components/version_info/version_info.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/cdm_service.h"
|
| +#include "content/public/browser/cdm_registry.h"
|
| #include "content/public/browser/plugin_service.h"
|
| #include "content/public/common/cdm_info.h"
|
| #include "content/public/common/pepper_plugin_info.h"
|
| @@ -43,7 +43,7 @@
|
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. NOLINT
|
|
|
| using content::BrowserThread;
|
| -using content::CdmService;
|
| +using content::CdmRegistry;
|
| using content::PluginService;
|
|
|
| namespace component_updater {
|
| @@ -228,14 +228,14 @@ void RegisterWidevineCdmWithChrome(
|
| PluginService::GetInstance()->RefreshPlugins();
|
| PluginService::GetInstance()->PurgePluginListCache(NULL, false);
|
|
|
| - // Also register Widevine with the CdmService.
|
| + // Also register Widevine with the CdmRegistry.
|
| const base::FilePath cdm_path =
|
| 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);
|
| - CdmService::GetInstance()->RegisterCdm(content::CdmInfo(
|
| + CdmRegistry::GetInstance()->RegisterCdm(content::CdmInfo(
|
| kWidevineCdmType, cdm_version, cdm_path, supported_codecs));
|
| }
|
|
|
|
|