Chromium Code Reviews| Index: content/browser/gpu/gpu_process_host.cc |
| diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc |
| index c26bc4d83a5abcc71efb992e376901a8a5949434..ec40dd9337347ad88abbc28a49d9477c397dc3b9 100644 |
| --- a/content/browser/gpu/gpu_process_host.cc |
| +++ b/content/browser/gpu/gpu_process_host.cc |
| @@ -202,13 +202,12 @@ void SendGpuProcessMessageByHostId(int host_id, IPC::Message* message) { |
| class GpuSandboxedProcessLauncherDelegate |
| : public SandboxedProcessLauncherDelegate { |
| public: |
| - GpuSandboxedProcessLauncherDelegate(base::CommandLine* cmd_line, |
| - ChildProcessHost* host) |
| + explicit GpuSandboxedProcessLauncherDelegate(base::CommandLine* cmd_line) |
| #if defined(OS_WIN) |
| - : cmd_line_(cmd_line) {} |
| -#elif defined(OS_POSIX) |
| - : ipc_fd_(host->TakeClientFileDescriptor()) {} |
| + : cmd_line_(cmd_line) |
| #endif |
| + { |
| + } |
|
nasko
2016/11/09 18:38:10
Is this formatted using "git cl format"?
Sam McNally
2016/11/09 20:21:39
Yes.
|
| ~GpuSandboxedProcessLauncherDelegate() override {} |
| @@ -289,9 +288,6 @@ class GpuSandboxedProcessLauncherDelegate |
| return true; |
| } |
| -#elif defined(OS_POSIX) |
| - |
| - base::ScopedFD TakeIpcFd() override { return std::move(ipc_fd_); } |
| #endif // OS_WIN |
| SandboxType GetSandboxType() override { |
| @@ -301,8 +297,6 @@ class GpuSandboxedProcessLauncherDelegate |
| private: |
| #if defined(OS_WIN) |
| base::CommandLine* cmd_line_; |
| -#elif defined(OS_POSIX) |
| - base::ScopedFD ipc_fd_; |
| #endif // OS_WIN |
| }; |
| @@ -1049,9 +1043,8 @@ bool GpuProcessHost::LaunchGpuProcess(gpu::GpuPreferences* gpu_preferences) { |
| if (!gpu_launcher.empty()) |
| cmd_line->PrependWrapper(gpu_launcher); |
| - process_->Launch( |
| - new GpuSandboxedProcessLauncherDelegate(cmd_line, process_->GetHost()), |
| - cmd_line, true); |
| + process_->Launch(new GpuSandboxedProcessLauncherDelegate(cmd_line), cmd_line, |
| + true); |
| process_launched_ = true; |
| UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents", |