diff options
Diffstat (limited to 'chromium/components/cdm/renderer')
5 files changed, 9 insertions, 11 deletions
diff --git a/chromium/components/cdm/renderer/BUILD.gn b/chromium/components/cdm/renderer/BUILD.gn index d7dceadcbfb..c14dd74f07c 100644 --- a/chromium/components/cdm/renderer/BUILD.gn +++ b/chromium/components/cdm/renderer/BUILD.gn @@ -22,7 +22,7 @@ static_library("renderer") { "//components/cdm/common", "//content/public/renderer", "//media", - "//ppapi/features", + "//media:media_features", "//third_party/widevine/cdm:headers", ] } diff --git a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc index b43b5c682a8..e50b76a8ea3 100644 --- a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc +++ b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.cc @@ -7,11 +7,10 @@ #include "base/logging.h" #include "media/base/eme_constants.h" #include "media/media_features.h" -#include "ppapi/features/features.h" namespace cdm { -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) const char kExternalClearKeyPepperType[] = "application/x-ppapi-clearkey-cdm"; #endif @@ -82,7 +81,7 @@ ExternalClearKeyProperties::GetDistinctiveIdentifierSupport() const { return media::EmeFeatureSupport::NOT_SUPPORTED; } -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) std::string ExternalClearKeyProperties::GetPepperType() const { return kExternalClearKeyPepperType; } diff --git a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h index 9b50b1a98e8..a8f8e035171 100644 --- a/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h +++ b/chromium/components/cdm/renderer/external_clear_key_key_system_properties.h @@ -9,11 +9,11 @@ #include "build/build_config.h" #include "media/base/key_system_properties.h" -#include "ppapi/features/features.h" +#include "media/media_features.h" namespace cdm { -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) extern const char kExternalClearKeyPepperType[]; #endif @@ -36,7 +36,7 @@ class ExternalClearKeyProperties : public media::KeySystemProperties { const override; media::EmeFeatureSupport GetPersistentStateSupport() const override; media::EmeFeatureSupport GetDistinctiveIdentifierSupport() const override; -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) std::string GetPepperType() const override; #endif diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.cc b/chromium/components/cdm/renderer/widevine_key_system_properties.cc index c16e8e7828f..e2b8d57138d 100644 --- a/chromium/components/cdm/renderer/widevine_key_system_properties.cc +++ b/chromium/components/cdm/renderer/widevine_key_system_properties.cc @@ -5,7 +5,6 @@ #include "components/cdm/renderer/widevine_key_system_properties.h" #include "media/media_features.h" -#include "ppapi/features/features.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. #if defined(WIDEVINE_CDM_AVAILABLE) @@ -163,7 +162,7 @@ EmeFeatureSupport WidevineKeySystemProperties::GetDistinctiveIdentifierSupport() return distinctive_identifier_support_; } -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) std::string WidevineKeySystemProperties::GetPepperType() const { return kWidevineCdmPluginMimeType; } diff --git a/chromium/components/cdm/renderer/widevine_key_system_properties.h b/chromium/components/cdm/renderer/widevine_key_system_properties.h index c61ce2efbe7..0f8fcaf77c2 100644 --- a/chromium/components/cdm/renderer/widevine_key_system_properties.h +++ b/chromium/components/cdm/renderer/widevine_key_system_properties.h @@ -7,7 +7,7 @@ #include "build/build_config.h" #include "media/base/key_system_properties.h" -#include "ppapi/features/features.h" +#include "media/media_features.h" namespace cdm { @@ -57,7 +57,7 @@ class WidevineKeySystemProperties : public media::KeySystemProperties { media::EmeFeatureSupport GetPersistentStateSupport() const override; media::EmeFeatureSupport GetDistinctiveIdentifierSupport() const override; -#if BUILDFLAG(ENABLE_PEPPER_CDMS) +#if BUILDFLAG(ENABLE_LIBRARY_CDMS) std::string GetPepperType() const override; #endif |