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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1532423003: Have each SandboxedProcessLauncherDelegate maintain a zygote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixup the namespace and header name. Created 4 years, 11 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 6255f4a32afee5b8c581d75ab49268b7a4e3fbb9..2c06d4d9c62713b765e960f44623476a058f0d87 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -52,9 +52,11 @@
#include "content/browser/mojo/mojo_shell_context.h"
#include "content/browser/net/browser_online_state_observer.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/speech/speech_recognition_manager_impl.h"
#include "content/browser/startup_task_runner.h"
#include "content/browser/time_zone_monitor.h"
+#include "content/browser/utility_process_host_impl.h"
#include "content/browser/webui/content_web_ui_controller_factory.h"
#include "content/browser/webui/url_data_manager.h"
#include "content/common/content_switches_internal.h"
@@ -153,6 +155,10 @@
#include "content/browser/renderer_host/render_sandbox_host_linux.h"
#include "content/browser/zygote_host/zygote_host_impl_linux.h"
#include "sandbox/linux/suid/client/setuid_sandbox_host.h"
+
+#if !defined(OS_ANDROID)
+#include "content/browser/ppapi_plugin_process_host.h"
+#endif
#endif
#if defined(ENABLE_PLUGINS)
@@ -221,6 +227,9 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) {
// Tickle the sandbox host and zygote host so they fork now.
RenderSandboxHostLinux::GetInstance()->Init();
+ RenderProcessHostImpl::EarlyZygoteLaunch();
+ PpapiPluginProcessHost::EarlyZygoteLaunch();
+ UtilityProcessHostImpl::EarlyZygoteLaunch();
ZygoteHostImpl::GetInstance()->Init(sandbox_binary.value());
}
#endif

Powered by Google App Engine
This is Rietveld 408576698