Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index b024d9fc7fee9e5b5d2526a2c8c5017db6a3d118..bd97520f2bf35ae4c5f23d44376d87fdaed69665 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -177,6 +177,7 @@ |
#include "content/browser/zygote_host/zygote_host_impl_linux.h" |
#if !defined(OS_ANDROID) |
Lei Zhang
2017/04/27 23:02:52
I was wondering about how Linux-y the Zygote code
|
+#include "content/browser/zygote_host/zygote_communication_linux.h" |
#include "content/public/browser/zygote_handle_linux.h" |
#endif // !defined(OS_ANDROID) |
#endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
@@ -229,7 +230,11 @@ void SetupSandbox(const base::CommandLine& parsed_command_line) { |
// Tickle the zygote host so it forks now. |
ZygoteHostImpl::GetInstance()->Init(parsed_command_line); |
*GetGenericZygote() = CreateZygote(); |
- RenderProcessHostImpl::EarlyZygoteLaunch(); |
+ // TODO(kerrnel): Investigate doing this without the ZygoteHostImpl as a |
+ // proxy. It is currently done this way due to concerns about race |
+ // conditions. |
+ ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( |
+ (*GetGenericZygote())->GetSandboxStatus()); |
} |
#endif |