Mojo EDK: Add safe process connection API

services/service_manager/runner/host/service_process_launcher.cc

 // Copyright 2016 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/service_manager/runner/host/service_process_launcher.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 29 matching lines @@
 namespace service_manager {
 
 ServiceProcessLauncher::ServiceProcessLauncher(
     base::TaskRunner* launch_process_runner,
     Delegate* delegate,
     const base::FilePath& service_path)
     : launch_process_runner_(launch_process_runner),
       delegate_(delegate),
       start_sandboxed_(false),
       service_path_(service_path),
-      child_token_(mojo::edk::GenerateRandomToken()),
       start_child_process_event_(
           base::WaitableEvent::ResetPolicy::AUTOMATIC,
           base::WaitableEvent::InitialState::NOT_SIGNALED),
       weak_factory_(this) {
   if (service_path_.empty())
     service_path_ = base::CommandLine::ForCurrentProcess()->GetProgram();
 }
 
 ServiceProcessLauncher::~ServiceProcessLauncher() {
   Join();
@@ skipping 22 matching lines @@
   child_command_line->AppendSwitchASCII("u", target.user_id());
 #endif
 
   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::ServicePtr client =
-      PassServiceRequestOnCommandLine(child_command_line.get(), child_token_);
+  mojom::ServicePtr client = PassServiceRequestOnCommandLine(
+      process_connection_, child_command_line.get());
   launch_process_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&ServiceProcessLauncher::DoLaunch, base::Unretained(this),
                  base::Passed(&child_command_line)),
       base::Bind(&ServiceProcessLauncher::DidStart,
                  weak_factory_.GetWeakPtr(), callback));
   return client;
 }
 
 void ServiceProcessLauncher::Join() {
@@ skipping 85 matching lines @@
   }
 
   if (child_process_.IsValid()) {
     DVLOG(0) << "Launched child process pid=" << child_process_.Pid()
              << ", instance=" << target_.instance()
              << ", name=" << target_.name()
              << ", user_id=" << target_.user_id();
 
     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)),
-          child_token_);
+      process_connection_.Connect(child_process_.Handle(),
+                                  mojo_ipc_channel_->PassServerHandle());
     }
   }
   start_child_process_event_.Signal();
 }
 
 }  // namespace service_manager