[mojo-edk] Bind a child token to child launches and port reservations.

services/shell/runner/host/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 "services/shell/runner/host/child_process_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 32 matching lines @@
 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner,
                                    NativeRunnerDelegate* delegate,
                                    bool start_sandboxed,
                                    const Identity& target,
                                    const base::FilePath& app_path)
     : launch_process_runner_(launch_process_runner),
       delegate_(delegate),
       start_sandboxed_(start_sandboxed),
       target_(target),
       app_path_(app_path),
+      child_token_(mojo::edk::GenerateRandomToken()),
       start_child_process_event_(
           base::WaitableEvent::ResetPolicy::AUTOMATIC,
           base::WaitableEvent::InitialState::NOT_SIGNALED),
       weak_factory_(this) {}
 
 ChildProcessHost::~ChildProcessHost() {
   if (!app_path_.empty()) {
     CHECK(!mojo_ipc_channel_)
         << "Destroying ChildProcessHost before calling Join";
   }
@@ skipping 28 matching lines @@
     child_command_line->AppendSwitchPath(switches::kChildProcess, app_path_);
 
   if (start_sandboxed_)
     child_command_line->AppendSwitch(switches::kEnableSandbox);
 
   mojo_ipc_channel_.reset(new mojo::edk::PlatformChannelPair);
   mojo_ipc_channel_->PrepareToPassClientHandleToChildProcess(
       child_command_line.get(), &handle_passing_info_);
 
   mojom::ShellClientPtr client =
-      PassShellClientRequestOnCommandLine(child_command_line.get());
+      PassShellClientRequestOnCommandLine(child_command_line.get(),
+                                          child_token_);
   launch_process_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&ChildProcessHost::DoLaunch, base::Unretained(this),
                  base::Passed(&child_command_line)),
       base::Bind(&ChildProcessHost::DidStart,
                  weak_factory_.GetWeakPtr(), callback));
   return client;
 }
 
 void ChildProcessHost::Join() {
@@ skipping 83 matching lines @@
     mach_broker->ExpectPid(child_process_.Handle());
 #endif
   }
 
   if (child_process_.IsValid()) {
     if (mojo_ipc_channel_.get()) {
       mojo_ipc_channel_->ChildProcessLaunched();
       mojo::edk::ChildProcessLaunched(
           child_process_.Handle(),
           mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(
-              mojo_ipc_channel_->PassServerHandle().release().handle)));
+              mojo_ipc_channel_->PassServerHandle().release().handle)),
+          child_token_);
     }
   }
   start_child_process_event_.Signal();
 }
 
 }  // namespace shell