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

Unified Diff: content/ppapi_plugin/ppapi_thread.cc

Issue 2755763002: media: Add build flag for CDM host verification (Closed)
Patch Set: fix cdm_host_file_path.cc Created 3 years, 9 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/common/BUILD.gn ('k') | content/zygote/zygote_main_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/ppapi_plugin/ppapi_thread.cc
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 6743e954f4862e9414bfd780b895f600618b9318..c173a4c20da6ab8549d2491ae2766d24b0ef9a80 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -65,7 +65,7 @@
#include "content/common/sandbox_init_mac.h"
#endif
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
#include "content/common/media/cdm_host_files.h"
#endif
@@ -376,7 +376,7 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
}
}
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
// Use a local instance of CdmHostFiles so that if we return early for any
// error, all files will closed automatically.
std::unique_ptr<CdmHostFiles> cdm_host_files;
@@ -390,7 +390,7 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
if (is_broker_ || !IsCdm(path))
cdm_host_files.reset(); // Close all opened files.
#endif // defined(OS_WIN) || defined(OS_MACOSX)
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
+#endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
#if defined(OS_WIN)
// If code subsequently tries to exit using abort(), force a crash (since
@@ -478,7 +478,7 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
ReportLoadResult(path, INIT_FAILED);
return;
}
-#if BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
// Now the process is sandboxed. Verify CDM host.
if (cdm_host_files) {
DCHECK(IsCdm(path));
@@ -489,7 +489,7 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
return;
}
}
-#endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
+#endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
}
// Initialization succeeded, so keep the plugin DLL loaded.
« no previous file with comments | « content/common/BUILD.gn ('k') | content/zygote/zygote_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698