| Index: content/renderer/media/cdm/render_cdm_factory.cc
 | 
| diff --git a/content/renderer/media/cdm/render_cdm_factory.cc b/content/renderer/media/cdm/render_cdm_factory.cc
 | 
| index fb2335ede14249d05b7d8b510d1f0cb107e6cef4..068d8f3157c8eb17eac08748744a9fb91838bb32 100644
 | 
| --- a/content/renderer/media/cdm/render_cdm_factory.cc
 | 
| +++ b/content/renderer/media/cdm/render_cdm_factory.cc
 | 
| @@ -16,20 +16,22 @@
 | 
|  #include "media/base/key_systems.h"
 | 
|  #include "media/base/media_keys.h"
 | 
|  #include "media/cdm/aes_decryptor.h"
 | 
| +#include "ppapi/features/features.h"
 | 
|  #include "url/gurl.h"
 | 
| -#if defined(ENABLE_PEPPER_CDMS)
 | 
| +
 | 
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
 | 
|  #include "content/renderer/media/cdm/ppapi_decryptor.h"
 | 
| -#endif  // defined(ENABLE_PEPPER_CDMS)
 | 
| +#endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 | 
|  
 | 
|  namespace content {
 | 
|  
 | 
| -#if defined(ENABLE_PEPPER_CDMS)
 | 
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
 | 
|  RenderCdmFactory::RenderCdmFactory(
 | 
|      const CreatePepperCdmCB& create_pepper_cdm_cb)
 | 
|      : create_pepper_cdm_cb_(create_pepper_cdm_cb) {}
 | 
|  #else
 | 
|  RenderCdmFactory::RenderCdmFactory() {}
 | 
| -#endif  // defined(ENABLE_PEPPER_CDMS)
 | 
| +#endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 | 
|  
 | 
|  RenderCdmFactory::~RenderCdmFactory() {
 | 
|    DCHECK(thread_checker_.CalledOnValidThread());
 | 
| @@ -63,7 +65,7 @@ void RenderCdmFactory::Create(
 | 
|      return;
 | 
|    }
 | 
|  
 | 
| -#if defined(ENABLE_PEPPER_CDMS)
 | 
| +#if BUILDFLAG(ENABLE_PEPPER_CDMS)
 | 
|    DCHECK(!cdm_config.use_hw_secure_codecs);
 | 
|    PpapiDecryptor::Create(
 | 
|        key_system, security_origin, cdm_config.allow_distinctive_identifier,
 | 
| @@ -75,7 +77,7 @@ void RenderCdmFactory::Create(
 | 
|    base::ThreadTaskRunnerHandle::Get()->PostTask(
 | 
|        FROM_HERE,
 | 
|        base::Bind(cdm_created_cb, nullptr, "Key system not supported."));
 | 
| -#endif  // defined(ENABLE_PEPPER_CDMS)
 | 
| +#endif  // BUILDFLAG(ENABLE_PEPPER_CDMS)
 | 
|  }
 | 
|  
 | 
|  }  // namespace content
 | 
| 
 |