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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1643533006: Use a single, generic, global zygote to temporarily resolve perf regressions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused ppapi header 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
« no previous file with comments | « components/nacl/browser/nacl_process_host.cc ('k') | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 141eab865ce5503ff08c979e5dc9616a36b27d76..f60fb3eb3ea911e6fac3710dfdbc256f430b55b6 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -156,9 +156,10 @@
#include "sandbox/linux/suid/client/setuid_sandbox_host.h"
#if !defined(OS_ANDROID)
-#include "content/browser/ppapi_plugin_process_host.h"
-#endif
-#endif
+#include "content/public/browser/zygote_handle_linux.h"
+#endif // !defined(OS_ANDROID)
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+
#if defined(ENABLE_PLUGINS)
#include "content/browser/plugin_service_impl.h"
@@ -227,9 +228,8 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) {
// Tickle the sandbox host and zygote host so they fork now.
RenderSandboxHostLinux::GetInstance()->Init();
ZygoteHostImpl::GetInstance()->Init(sandbox_binary.value());
+ *GetGenericZygote() = CreateZygote();
RenderProcessHostImpl::EarlyZygoteLaunch();
- PpapiPluginProcessHost::EarlyZygoteLaunch();
- UtilityProcessHostImpl::EarlyZygoteLaunch();
}
#endif
« no previous file with comments | « components/nacl/browser/nacl_process_host.cc ('k') | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698