| Index: chrome/renderer/media/chrome_key_systems.cc
|
| diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
|
| index 7e62f1cb868811990dd8f12caa585492faf2ed72..d71ae8671fae9b6b4bf099a52d5cea662a95bcba 100644
|
| --- a/chrome/renderer/media/chrome_key_systems.cc
|
| +++ b/chrome/renderer/media/chrome_key_systems.cc
|
| @@ -20,13 +20,12 @@
|
| #include "content/public/renderer/render_thread.h"
|
| #include "media/base/eme_constants.h"
|
| #include "media/base/key_system_properties.h"
|
| -#include "ppapi/features/features.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "components/cdm/renderer/android_key_systems.h"
|
| #endif
|
|
|
| -#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| #include "base/feature_list.h"
|
| #include "media/base/media_switches.h"
|
| #endif
|
| @@ -43,7 +42,7 @@
|
| using media::KeySystemProperties;
|
| using media::SupportedCodecs;
|
|
|
| -#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| static bool IsPepperCdmAvailable(
|
| const std::string& pepper_type,
|
| std::vector<base::string16>* additional_param_names,
|
| @@ -214,11 +213,11 @@
|
| #endif // defined(OS_CHROMEOS)
|
| }
|
| #endif // defined(WIDEVINE_CDM_AVAILABLE)
|
| -#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| void AddChromeKeySystems(
|
| std::vector<std::unique_ptr<KeySystemProperties>>* key_systems_properties) {
|
| -#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| if (base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting))
|
| AddExternalClearKey(key_systems_properties);
|
|
|
| @@ -226,7 +225,7 @@
|
| AddPepperBasedWidevine(key_systems_properties);
|
| #endif // defined(WIDEVINE_CDM_AVAILABLE)
|
|
|
| -#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| #if defined(OS_ANDROID)
|
| cdm::AddAndroidWidevine(key_systems_properties);
|
|
|