Re-fix http://crbug.com/87176, and add a test.

content/browser/browser_child_process_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_child_process_host_impl.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 138 matching lines @@
     switches::kLoggingLevel,
     switches::kV,
     switches::kVModule,
 #if defined(OS_POSIX)
     switches::kChildCleanExit,
 #endif
   };
   cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches,
                              arraysize(kForwardSwitches));
 
-  child_process_.reset(new ChildProcessLauncher(
+  child_process_ = NewChildProcessLauncher(
 #if defined(OS_WIN)
       delegate,
 #elif defined(OS_POSIX)
       use_zygote,
       environ,
       child_process_host_->TakeClientFileDescriptor(),
 #endif
       cmd_line,
       data_.id,
-      this));
+      this);
 }
 
 const ChildProcessData& BrowserChildProcessHostImpl::GetData() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return data_;
 }
 
 ChildProcessHost* BrowserChildProcessHostImpl::GetHost() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return child_process_host_.get();
@@ skipping 161 matching lines @@
 
 void BrowserChildProcessHostImpl::OnProcessExitedEarly(
     base::WaitableEvent* event) {
   DeleteProcessWaitableEvent(event);
   OnChildDisconnected();
 }
 
 #endif
 
 }  // namespace content