Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1649)

Unified Diff: content/renderer/media/cdm/render_cdm_factory.cc

Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 068d8f3157c8eb17eac08748744a9fb91838bb32..fb2335ede14249d05b7d8b510d1f0cb107e6cef4 100644
--- a/content/renderer/media/cdm/render_cdm_factory.cc
+++ b/content/renderer/media/cdm/render_cdm_factory.cc
@@ -16,22 +16,20 @@
#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 BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
#include "content/renderer/media/cdm/ppapi_decryptor.h"
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
+#endif // defined(ENABLE_PEPPER_CDMS)
namespace content {
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
RenderCdmFactory::RenderCdmFactory(
const CreatePepperCdmCB& create_pepper_cdm_cb)
: create_pepper_cdm_cb_(create_pepper_cdm_cb) {}
#else
RenderCdmFactory::RenderCdmFactory() {}
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
+#endif // defined(ENABLE_PEPPER_CDMS)
RenderCdmFactory::~RenderCdmFactory() {
DCHECK(thread_checker_.CalledOnValidThread());
@@ -65,7 +63,7 @@
return;
}
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(ENABLE_PEPPER_CDMS)
DCHECK(!cdm_config.use_hw_secure_codecs);
PpapiDecryptor::Create(
key_system, security_origin, cdm_config.allow_distinctive_identifier,
@@ -77,7 +75,7 @@
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(cdm_created_cb, nullptr, "Key system not supported."));
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
+#endif // defined(ENABLE_PEPPER_CDMS)
}
} // namespace content
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698