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

content/browser/renderer_host/render_process_host_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 166 matching lines @@
   // This should only be used for process-per-site mode, which can be enabled
   // globally with a command line flag or per-site, as determined by
   // SiteInstanceImpl::ShouldUseProcessPerSite.
   static void RegisterProcessHostForSite(
       BrowserContext* browser_context,
       RenderProcessHost* process,
       const GURL& url);
 
   static base::MessageLoop* GetInProcessRendererThreadForTesting();
 
+  void SetChildProcessLauncherFactory(
+      const base::Callback<scoped_ptr<ChildProcessLauncher>(
+#if defined(OS_WIN)
+          SandboxedProcessLauncherDelegate* delegate,
+#elif defined(OS_POSIX)
+          bool use_zygote,
+          const base::EnvironmentVector& environ,
+          int ipcfd,
+#endif
+          CommandLine* cmd_line,
+          int child_process_id,
+          ChildProcessLauncher::Client* client)>& factory) {
+    child_process_launcher_factory_ = factory;
+  }
+
  protected:
   // A proxy for our IPC::Channel that lives on the IO thread (see
   // browser_process.h)
   scoped_ptr<IPC::ChannelProxy> channel_;
 
   // The registered render widget hosts. When this list is empty or all NULL,
   // we should delete ourselves
   IDMap<RenderWidgetHost> render_widget_hosts_;
 
   // True if fast shutdown has been performed on this RPH.
@@ skipping 74 matching lines @@
   // This is used to clear our cache five seconds after the last use.
   base::DelayTimer<RenderProcessHostImpl> cached_dibs_cleaner_;
 
   // Used in single-process mode.
   scoped_ptr<RendererMainThread> in_process_renderer_;
 
   // True after Init() has been called. We can't just check channel_ because we
   // also reset that in the case of process termination.
   bool is_initialized_;
 
+  // Used to mock out child_process_launcher_ in tests.  See
+  // NewChildProcessLauncher() for the interface.
+  base::Callback<scoped_ptr<ChildProcessLauncher>(
+#if defined(OS_WIN)
+      SandboxedProcessLauncherDelegate* delegate,
+#elif defined(OS_POSIX)
+      bool use_zygote,
+      const base::EnvironmentVector& environ,
+      int ipcfd,
+#endif
+      CommandLine* cmd_line,
+      int child_process_id,
+      ChildProcessLauncher::Client* client)>
+      child_process_launcher_factory_;
+
   // Used to launch and terminate the process without blocking the UI thread.
   scoped_ptr<ChildProcessLauncher> child_process_launcher_;
 
   // Messages we queue while waiting for the process handle.  We queue them here
   // instead of in the channel so that we ensure they're sent after init related
   // messages that are sent once the process handle is available.  This is
   // because the queued messages may have dependencies on the init messages.
   std::queue<IPC::Message*> queued_messages_;
 
   // The globally-unique identifier for this RPH.
@@ skipping 43 matching lines @@
   // Prevents the class from being added as a GpuDataManagerImpl observer more
   // than once.
   bool gpu_observer_registered_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_