| Index: content/renderer/media/cdm/render_cdm_factory.h
|
| diff --git a/content/renderer/media/cdm/render_cdm_factory.h b/content/renderer/media/cdm/render_cdm_factory.h
|
| index 1b03c4017a6b8baba9e79b35d8f68134f711059c..1a9f361a8ea06f6243b83e1f01a9c42b88b10416 100644
|
| --- a/content/renderer/media/cdm/render_cdm_factory.h
|
| +++ b/content/renderer/media/cdm/render_cdm_factory.h
|
| @@ -12,8 +12,9 @@
|
| #include "base/threading/thread_checker.h"
|
| #include "media/base/cdm_factory.h"
|
| #include "media/base/media_keys.h"
|
| +#include "ppapi/features/features.h"
|
|
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| #include "content/renderer/media/cdm/pepper_cdm_wrapper.h"
|
| #endif
|
|
|
| @@ -29,11 +30,11 @@ namespace content {
|
| // and should only be used on one thread.
|
| class RenderCdmFactory : public media::CdmFactory {
|
| public:
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| explicit RenderCdmFactory(const CreatePepperCdmCB& create_pepper_cdm_cb);
|
| #else
|
| RenderCdmFactory();
|
| -#endif // defined(ENABLE_PEPPER_CDMS)
|
| +#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
|
|
|
| ~RenderCdmFactory() override;
|
|
|
| @@ -49,7 +50,7 @@ class RenderCdmFactory : public media::CdmFactory {
|
| const media::CdmCreatedCB& cdm_created_cb) override;
|
|
|
| private:
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| CreatePepperCdmCB create_pepper_cdm_cb_;
|
| #endif
|
|
|
|
|