| 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 66698f376a201e54b377d4e0e8172a44efb6af51..9c9f0b3bda9bb1d259b971ac899ef5791b6d8ffc 100644
|
| --- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc
|
| +++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
|
| @@ -41,7 +41,7 @@ using content::PluginService;
|
|
|
| namespace component_updater {
|
|
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#if defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
|
|
| namespace {
|
|
|
| @@ -361,10 +361,10 @@ void WidevineCdmComponentInstallerTraits::UpdateCdmAdapter(
|
| base::Passed(&manifest)));
|
| }
|
|
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#endif // defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
|
|
| void RegisterWidevineCdmComponent(ComponentUpdateService* cus) {
|
| -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#if defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| base::FilePath adapter_source_path;
|
| PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &adapter_source_path);
|
| if (!base::PathExists(adapter_source_path))
|
| @@ -377,7 +377,7 @@ void RegisterWidevineCdmComponent(ComponentUpdateService* cus) {
|
| installer->Register(cus);
|
| #else
|
| return;
|
| -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| +#endif // defined(ENABLE_WIDEVINE_CDM) && defined(WIDEVINE_CDM_IS_COMPONENT)
|
| }
|
|
|
| } // namespace component_updater
|
|
|