| Index: content/browser/renderer_host/render_process_host_impl.cc
 | 
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
 | 
| index cd16442cedd8847a2cea31118990c4955fc0d20b..3712471ca9a6d8558ff9ac7c09f2b7e5d17d520a 100644
 | 
| --- a/content/browser/renderer_host/render_process_host_impl.cc
 | 
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
 | 
| @@ -376,12 +376,7 @@ ZygoteHandle g_render_zygote;
 | 
|  class RendererSandboxedProcessLauncherDelegate
 | 
|      : public SandboxedProcessLauncherDelegate {
 | 
|   public:
 | 
| -  explicit RendererSandboxedProcessLauncherDelegate(IPC::ChannelProxy* channel)
 | 
| -#if defined(OS_POSIX)
 | 
| -      : ipc_fd_(channel->TakeClientFileDescriptor())
 | 
| -#endif  // OS_POSIX
 | 
| -  {
 | 
| -  }
 | 
| +  RendererSandboxedProcessLauncherDelegate() {}
 | 
|  
 | 
|    ~RendererSandboxedProcessLauncherDelegate() override {}
 | 
|  
 | 
| @@ -398,8 +393,7 @@ class RendererSandboxedProcessLauncherDelegate
 | 
|      return GetContentClient()->browser()->PreSpawnRenderer(policy);
 | 
|    }
 | 
|  
 | 
| -#elif defined(OS_POSIX)
 | 
| -#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 | 
| +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 | 
|    ZygoteHandle* GetZygote() override {
 | 
|      const base::CommandLine& browser_command_line =
 | 
|          *base::CommandLine::ForCurrentProcess();
 | 
| @@ -409,16 +403,9 @@ class RendererSandboxedProcessLauncherDelegate
 | 
|        return nullptr;
 | 
|      return GetGenericZygote();
 | 
|    }
 | 
| -#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
 | 
| -  base::ScopedFD TakeIpcFd() override { return std::move(ipc_fd_); }
 | 
|  #endif  // OS_WIN
 | 
|  
 | 
|    SandboxType GetSandboxType() override { return SANDBOX_TYPE_RENDERER; }
 | 
| -
 | 
| - private:
 | 
| -#if defined(OS_POSIX)
 | 
| -  base::ScopedFD ipc_fd_;
 | 
| -#endif  // OS_POSIX
 | 
|  };
 | 
|  
 | 
|  const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
 | 
| @@ -893,9 +880,8 @@ bool RenderProcessHostImpl::Init() {
 | 
|      // As long as there's no renderer prefix, we can use the zygote process
 | 
|      // at this stage.
 | 
|      child_process_launcher_.reset(new ChildProcessLauncher(
 | 
| -        new RendererSandboxedProcessLauncherDelegate(channel_.get()), cmd_line,
 | 
| -        GetID(), this, child_token_,
 | 
| -        base::Bind(&RenderProcessHostImpl::OnMojoError, id_)));
 | 
| +        new RendererSandboxedProcessLauncherDelegate(), cmd_line, GetID(), this,
 | 
| +        child_token_, base::Bind(&RenderProcessHostImpl::OnMojoError, id_)));
 | 
|      channel_->Pause();
 | 
|  
 | 
|      fast_shutdown_started_ = false;
 | 
| 
 |