Mojo EDK: Add safe process connection API

chrome/utility/importer/firefox_importer_unittest_utils_mac.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 "chrome/utility/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 10 matching lines @@
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/common/importer/firefox_importer_utils.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/mojo_channel_switches.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/pending_process_connection.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "testing/multiprocess_func_list.h"
 
 #define IPC_MESSAGE_IMPL
 #include "chrome/utility/importer/firefox_importer_unittest_messages_internal.h"
 
 namespace {
 
 // Launch the child process:
@@ skipping 98 matching lines @@
 FFUnitTestDecryptorProxy::FFUnitTestDecryptorProxy() {
 }
 
 bool FFUnitTestDecryptorProxy::Setup(const base::FilePath& nss_path) {
   // Create a new message loop and spawn the child process.
   message_loop_.reset(new base::MessageLoopForIO());
 
   listener_.reset(new FFDecryptorServerChannelListener());
 
   // Set up IPC channel using ChannelMojo.
-  const std::string mojo_child_token = mojo::edk::GenerateRandomToken();
-  const std::string mojo_channel_token = mojo::edk::GenerateRandomToken();
-  mojo::ScopedMessagePipeHandle parent_handle =
-      mojo::edk::CreateParentMessagePipe(mojo_channel_token, mojo_child_token);
-  channel_ = IPC::Channel::CreateServer(parent_handle.release(),
-                                        listener_.get());
+  mojo::edk::PendingProcessConnection process;
+  std::string token;
+  mojo::ScopedMessagePipeHandle parent_pipe = process.CreateMessagePipe(&token);
+  channel_ = IPC::Channel::CreateServer(parent_pipe.release(), listener_.get());
   CHECK(channel_->Connect());
   listener_->SetSender(channel_.get());
 
   // Spawn child and set up sync IPC connection.
   mojo::edk::PlatformChannelPair channel_pair;
   child_process_ = LaunchNSSDecrypterChildProcess(
-      nss_path, channel_pair.PassClientHandle(), mojo_channel_token);
-  if (child_process_.IsValid()) {
-    mojo::edk::ChildProcessLaunched(child_process_.Handle(),
-                                    channel_pair.PassServerHandle(),
-                                    mojo_child_token);
-  } else {
-    mojo::edk::ChildProcessLaunchFailed(mojo_child_token);
-  }
-
+      nss_path, channel_pair.PassClientHandle(), token);
+  if (child_process_.IsValid())
+    process.Connect(child_process_.Handle(), channel_pair.PassServerHandle());
   return child_process_.IsValid();
 }
 
 FFUnitTestDecryptorProxy::~FFUnitTestDecryptorProxy() {
   listener_->QuitClient();
   channel_->Close();
 
   if (child_process_.IsValid()) {
     int exit_code;
     child_process_.WaitForExitWithTimeout(base::TimeDelta::FromSeconds(5),
@@ skipping 115 matching lines @@
   std::unique_ptr<IPC::Channel> channel =
       IPC::Channel::CreateClient(mojo_handle.release(), &listener);
   CHECK(channel->Connect());
   listener.SetSender(channel.get());
 
   // run message loop
   base::RunLoop().Run();
 
   return 0;
 }