| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 69144687c844b905321c44ace7a6ace4f094de9c..096178bc478602062e296a870d92c7a362397750 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -155,7 +155,6 @@
|
| #include "net/base/net_errors.h"
|
| #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
|
| #include "net/http/http_util.h"
|
| -#include "ppapi/features/features.h"
|
| #include "services/shell/public/cpp/interface_provider.h"
|
| #include "services/shell/public/cpp/interface_registry.h"
|
| #include "storage/common/data_element.h"
|
| @@ -228,7 +227,7 @@
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #endif
|
|
|
| -#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
|
| #include "content/renderer/media/cdm/render_cdm_factory.h"
|
| #endif
|
| @@ -6300,11 +6299,11 @@
|
| }
|
| #endif // defined(ENABLE_MOJO_CDM)
|
|
|
| -#if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#if defined(ENABLE_PEPPER_CDMS)
|
| DCHECK(frame_);
|
| cdm_factory_.reset(
|
| new RenderCdmFactory(base::Bind(&PepperCdmWrapperImpl::Create, frame_)));
|
| -#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| +#endif // defined(ENABLE_PEPPER_CDMS)
|
|
|
| return cdm_factory_.get();
|
| }
|
|
|