Make ChildProcessHost::DoLaunch() not touch a random set of things on a different thread.

shell/child_process_host.cc

 // Copyright 2014 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 "shell/child_process_host.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "shell/child_switches.h"
 #include "shell/context.h"
 #include "shell/task_runners.h"
 
 namespace shell {
 
+struct ChildProcessHost::LaunchData {
+  LaunchData() {}
+  ~LaunchData() {}
+
+  base::FilePath child_path;
+  mojo::embedder::PlatformChannelPair platform_channel_pair;
+  std::string child_connection_id;
+};
+
 ChildProcessHost::ChildProcessHost(Context* context)
     : context_(context), channel_info_(nullptr) {
 }
 
 ChildProcessHost::~ChildProcessHost() {
   DCHECK(!child_process_.IsValid());
 }
 
 void ChildProcessHost::Start() {
   DCHECK(!child_process_.IsValid());
 
+  scoped_ptr<LaunchData> launch_data(new LaunchData());
+  launch_data->child_path = context_->mojo_shell_child_path();
+
   // TODO(vtl): Add something for |slave_info|.
   mojo::embedder::ScopedPlatformHandle platform_handle_for_channel;
-  std::string child_connection_id;
   mojo::embedder::ConnectToSlave(
-      nullptr, platform_channel_pair_.PassServerHandle(),
-      &platform_handle_for_channel, &child_connection_id);
+      nullptr, launch_data->platform_channel_pair.PassServerHandle(),
+      &platform_handle_for_channel, &launch_data->child_connection_id);
 
   mojo::ScopedMessagePipeHandle handle(mojo::embedder::CreateChannel(
       platform_handle_for_channel.Pass(), context_->task_runners()->io_runner(),
       base::Bind(&ChildProcessHost::DidCreateChannel, base::Unretained(this)),
       base::MessageLoop::current()->message_loop_proxy()));
 
   controller_.Bind(mojo::InterfacePtrInfo<ChildController>(handle.Pass(), 0u));
   controller_.set_error_handler(this);
 
   CHECK(base::PostTaskAndReplyWithResult(
       context_->task_runners()->blocking_pool(), FROM_HERE,
       base::Bind(&ChildProcessHost::DoLaunch, base::Unretained(this),
-                 child_connection_id),
+                 base::Passed(&launch_data)),
       base::Bind(&ChildProcessHost::DidStart, base::Unretained(this))));
 }
 
 int ChildProcessHost::Join() {
   DCHECK(child_process_.IsValid());
   int rv = -1;
   LOG_IF(ERROR, !child_process_.WaitForExit(&rv))
       << "Failed to wait for child process";
   child_process_.Close();
   return rv;
@@ skipping 10 matching lines @@
       app_path, application_request.Pass(),
       base::Bind(&ChildProcessHost::AppCompleted, base::Unretained(this)));
 }
 
 void ChildProcessHost::ExitNow(int32_t exit_code) {
   DCHECK(controller_);
 
   controller_->ExitNow(exit_code);
 }
 
-void ChildProcessHost::DidStart(bool success) {
+void ChildProcessHost::DidStart(base::Process child_process) {
   DVLOG(2) << "ChildProcessHost::DidStart()";
+  DCHECK(!child_process_.IsValid());
 
-  if (!success) {
+  if (!child_process.IsValid()) {
     LOG(ERROR) << "Failed to start app child process";
     AppCompleted(MOJO_RESULT_UNKNOWN);
     return;
   }
+
+  child_process_ = child_process.Pass();
 }
 
 // Callback for |mojo::embedder::CreateChannel()|.
 void ChildProcessHost::DidCreateChannel(
     mojo::embedder::ChannelInfo* channel_info) {
   DVLOG(2) << "ChildProcessHost::DidCreateChannel()";
 
   CHECK(channel_info);
   channel_info_ = channel_info;
 }
 
-bool ChildProcessHost::DoLaunch(const std::string& child_connection_id) {
+base::Process ChildProcessHost::DoLaunch(scoped_ptr<LaunchData> launch_data) {
   static const char* kForwardSwitches[] = {
       switches::kTraceToConsole, switches::kV, switches::kVModule,
   };
 
-  base::CommandLine child_command_line(context_->mojo_shell_child_path());
+  base::CommandLine child_command_line(launch_data->child_path);
   child_command_line.CopySwitchesFrom(*base::CommandLine::ForCurrentProcess(),
                                       kForwardSwitches,
                                       arraysize(kForwardSwitches));
   child_command_line.AppendSwitchASCII(switches::kChildConnectionId,
-                                       child_connection_id);
+                                       launch_data->child_connection_id);
 
   mojo::embedder::HandlePassingInformation handle_passing_info;
-  platform_channel_pair_.PrepareToPassClientHandleToChildProcess(
+  launch_data->platform_channel_pair.PrepareToPassClientHandleToChildProcess(
       &child_command_line, &handle_passing_info);
 
   base::LaunchOptions options;
   options.fds_to_remap = &handle_passing_info;
   DVLOG(2) << "Launching child with command line: "
            << child_command_line.GetCommandLineString();
-  child_process_ = base::LaunchProcess(child_command_line, options);
-  if (!child_process_.IsValid())
-    return false;
-
-  platform_channel_pair_.ChildProcessLaunched();
-  return true;
+  base::Process child_process =
+      base::LaunchProcess(child_command_line, options);
+  if (child_process.IsValid())
+    launch_data->platform_channel_pair.ChildProcessLaunched();
+  return child_process.Pass();
 }
 
 void ChildProcessHost::AppCompleted(int32_t result) {
   if (!on_app_complete_.is_null()) {
     auto on_app_complete = on_app_complete_;
     on_app_complete_.reset();
     on_app_complete.Run(result);
   }
 }
 
 void ChildProcessHost::OnConnectionError() {
   AppCompleted(MOJO_RESULT_UNKNOWN);
 }
 
 }  // namespace shell