Mojo EDK: Add safe process connection API

mojo/edk/test/multiprocess_test_helper.cc

 // Copyright 2013 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 "mojo/edk/test/multiprocess_test_helper.h"
 
 #include <functional>
 #include <set>
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
 #include "base/process/process_handle.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/named_platform_handle.h"
 #include "mojo/edk/embedder/named_platform_handle_utils.h"
+#include "mojo/edk/embedder/pending_process_connection.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mach_port_broker.h"
 #endif
 
 namespace mojo {
@@ skipping 68 matching lines @@
     base::FilePath temp_dir;
     CHECK(base::PathService::Get(base::DIR_TEMP, &temp_dir));
     named_pipe = NamedPlatformHandle(
         temp_dir.AppendASCII(GenerateRandomToken()).value());
 #else
     named_pipe = NamedPlatformHandle(GenerateRandomToken());
 #endif
     command_line.AppendSwitchNative(kMojoNamedPipeName, named_pipe.name);
   }
 
-  std::string pipe_token = mojo::edk::GenerateRandomToken();
-  if (launch_type == LaunchType::CHILD ||
-      launch_type == LaunchType::NAMED_CHILD)
-    command_line.AppendSwitchASCII(kMojoPrimordialPipeToken, pipe_token);
-
   if (!switch_string.empty()) {
     CHECK(!command_line.HasSwitch(switch_string));
     if (!switch_value.empty())
       command_line.AppendSwitchASCII(switch_string, switch_value);
     else
       command_line.AppendSwitch(switch_string);
   }
 
   base::LaunchOptions options;
 #if defined(OS_POSIX)
@@ skipping 12 matching lines @@
   // created before the child process is launched; otherwise the server binding
   // the pipe path can race with child's connection to the pipe.
   ScopedPlatformHandle server_handle;
   if (launch_type == LaunchType::CHILD || launch_type == LaunchType::PEER) {
     server_handle = channel.PassServerHandle();
   } else if (launch_type == LaunchType::NAMED_CHILD ||
              launch_type == LaunchType::NAMED_PEER) {
     server_handle = CreateServerHandle(named_pipe);
   }
 
+  PendingProcessConnection process;
   ScopedMessagePipeHandle pipe;
-  std::string child_token = mojo::edk::GenerateRandomToken();
   if (launch_type == LaunchType::CHILD ||
       launch_type == LaunchType::NAMED_CHILD) {
-    pipe = CreateParentMessagePipe(pipe_token, child_token);
+    std::string pipe_token;
+    pipe = process.CreateMessagePipe(&pipe_token);
+    command_line.AppendSwitchASCII(kMojoPrimordialPipeToken, pipe_token);
   } else if (launch_type == LaunchType::PEER ||
              launch_type == LaunchType::NAMED_PEER) {
     peer_token_ = mojo::edk::GenerateRandomToken();
     pipe = ConnectToPeerProcess(std::move(server_handle), peer_token_);
   }
 
   test_child_ =
       base::SpawnMultiProcessTestChild(test_child_main, command_line, options);
   if (launch_type == LaunchType::CHILD || launch_type == LaunchType::PEER)
     channel.ChildProcessLaunched();
 
   if (launch_type == LaunchType::CHILD ||
       launch_type == LaunchType::NAMED_CHILD) {
     DCHECK(server_handle.is_valid());
-    ChildProcessLaunched(test_child_.Handle(), std::move(server_handle),
-                         child_token, process_error_callback_);
+    process.Connect(test_child_.Handle(), std::move(server_handle),
+                    process_error_callback_);
   }
 
   CHECK(test_child_.IsValid());
   return pipe;
 }
 
 int MultiprocessTestHelper::WaitForChildShutdown() {
   CHECK(test_child_.IsValid());
 
   int rv = -1;
@@ skipping 63 matching lines @@
             ::testing::Test::HasNonfatalFailure()) ? 1 : 0;
   });
 }
 
 // static
 mojo::ScopedMessagePipeHandle MultiprocessTestHelper::primordial_pipe;
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo