Index: content/app/content_main_runner.cc |
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc |
index 604acb0165115bce865463c258eee0a876ab3495..9561e53535205390e00378c597d32cfbaba0fb07 100644 |
--- a/content/app/content_main_runner.cc |
+++ b/content/app/content_main_runner.cc |
@@ -111,6 +111,10 @@ |
#include "crypto/nss_util.h" |
#endif |
+#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+#include "content/common/media/cdm_host_files.h" |
+#endif |
+ |
namespace content { |
extern int GpuMain(const content::MainFunctionParams&); |
#if BUILDFLAG(ENABLE_PLUGINS) |
@@ -333,6 +337,15 @@ int RunZygote(const MainFunctionParams& main_function_params, |
command_line.GetSwitchValueASCII(switches::kProcessType); |
ContentClientInitializer::Set(process_type, delegate); |
+#if BUILDFLAG(ENABLE_PEPPER_CDMS) |
+ if (process_type != switches::kPpapiPluginProcess) { |
+ DVLOG(1) << "Closing CDM files for non-ppapi process."; |
+ CdmHostFiles::TakeGlobalInstance().reset(); |
+ } else { |
+ DVLOG(1) << "Not closing CDM files for ppapi process."; |
+ } |
+#endif |
+ |
MainFunctionParams main_params(command_line); |
main_params.zygote_child = true; |