Index: components/nacl/browser/nacl_process_host.cc |
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc |
index aae77fa3b6783932f639b08d5614f6128c7eac5b..41e337a408bb0fd76fb89ad7381449f100fd71f6 100644 |
--- a/components/nacl/browser/nacl_process_host.cc |
+++ b/components/nacl/browser/nacl_process_host.cc |
@@ -68,7 +68,6 @@ |
#include <netinet/in.h> |
#include <sys/socket.h> |
-#include "content/public/browser/zygote_handle_linux.h" |
#include "ipc/ipc_channel_posix.h" |
#elif defined(OS_WIN) |
#include <windows.h> |
@@ -156,10 +155,6 @@ |
namespace { |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) |
-content::ZygoteHandle g_nacl_zygote; |
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
- |
// NOTE: changes to this class need to be reviewed by the security team. |
class NaClSandboxedProcessLauncherDelegate |
: public content::SandboxedProcessLauncherDelegate { |
@@ -186,10 +181,7 @@ |
} |
} |
#elif defined(OS_POSIX) |
-#if !defined(OS_MACOSX) |
- content::ZygoteHandle* GetZygote() override { return &g_nacl_zygote; } |
-#endif // !defined(OS_MACOSX) |
- |
+ bool ShouldUseZygote() override { return true; } |
base::ScopedFD TakeIpcFd() override { return std::move(ipc_fd_); } |
#endif // OS_WIN |
@@ -424,14 +416,6 @@ |
} |
NaClBrowser::GetDelegate()->SetDebugPatterns(nacl_debug_mask); |
} |
- |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) |
-// static |
-void NaClProcessHost::EarlyZygoteLaunch() { |
- DCHECK(!g_nacl_zygote); |
- g_nacl_zygote = content::CreateZygote(); |
-} |
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
// static |
void NaClProcessHost::SetPpapiKeepAliveThrottleForTesting( |