Index: content/browser/utility_process_host_impl.cc |
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc |
index 2223f40c05c0b7af37772a4186008e3c94095b73..37806f2f5a4e98ea0fd16f1f4b09675f08650707 100644 |
--- a/content/browser/utility_process_host_impl.cc |
+++ b/content/browser/utility_process_host_impl.cc |
@@ -67,17 +67,16 @@ class UtilitySandboxedProcessLauncherDelegate |
UtilitySandboxedProcessLauncherDelegate(const base::FilePath& exposed_dir, |
bool launch_elevated, |
bool no_sandbox, |
- const base::EnvironmentMap& env, |
- ChildProcessHost* host) |
+ const base::EnvironmentMap& env) |
: exposed_dir_(exposed_dir), |
#if defined(OS_WIN) |
launch_elevated_(launch_elevated) |
#elif defined(OS_POSIX) |
- env_(env), |
+ env_(env) |
#if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
- no_sandbox_(no_sandbox), |
+ , |
+ no_sandbox_(no_sandbox) |
#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) |
- ipc_fd_(host->TakeClientFileDescriptor()) |
#endif // OS_WIN |
{} |
@@ -114,7 +113,6 @@ class UtilitySandboxedProcessLauncherDelegate |
} |
#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) |
base::EnvironmentMap GetEnvironment() override { return env_; } |
- base::ScopedFD TakeIpcFd() override { return std::move(ipc_fd_); } |
#endif // OS_WIN |
SandboxType GetSandboxType() override { |
@@ -131,7 +129,6 @@ class UtilitySandboxedProcessLauncherDelegate |
#if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
bool no_sandbox_; |
#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) |
- base::ScopedFD ipc_fd_; |
#endif // OS_WIN |
}; |
@@ -342,8 +339,7 @@ bool UtilityProcessHostImpl::StartProcess() { |
#endif |
process_->Launch(new UtilitySandboxedProcessLauncherDelegate( |
- exposed_dir_, run_elevated_, no_sandbox_, env_, |
- process_->GetHost()), |
+ exposed_dir_, run_elevated_, no_sandbox_, env_), |
cmd_line, true); |
} |