Mojo EDK: Add safe process connection API

services/service_manager/tests/util.cc

Index: services/service_manager/tests/util.cc
diff --git a/services/service_manager/tests/util.cc b/services/service_manager/tests/util.cc
index 98bc47dee6d3b780c4d22c8fd8ca5ba0be046b64..b12f6dbf8cc277335e35d9d7d3d9f5d336bbb98a 100644
--- a/services/service_manager/tests/util.cc
+++ b/services/service_manager/tests/util.cc
@@ -58,16 +58,11 @@ std::unique_ptr<Connection> LaunchAndConnectToProcess(
   platform_channel_pair.PrepareToPassClientHandleToChildProcess(
       &child_command_line, &handle_passing_info);
 
-  // Generate a token for the child to find and connect to a primordial pipe
-  // and pass that as well.
-  std::string primordial_pipe_token = mojo::edk::GenerateRandomToken();
-  child_command_line.AppendSwitchASCII(switches::kPrimordialPipeToken,
-                                        primordial_pipe_token);
-
-  // Allocate the pipe locally.
-  std::string child_token = mojo::edk::GenerateRandomToken();
+  mojo::edk::PendingProcessConnection pending_process;
+  std::string token;
   mojo::ScopedMessagePipeHandle pipe =
-      mojo::edk::CreateParentMessagePipe(primordial_pipe_token, child_token);
+      pending_process.CreateMessagePipe(&token);
+  child_command_line.AppendSwitchASCII(switches::kPrimordialPipeToken, token);
 
   service_manager::mojom::ServicePtr client;
   client.Bind(mojo::InterfacePtrInfo<service_manager::mojom::Service>(
@@ -94,9 +89,8 @@ std::unique_ptr<Connection> LaunchAndConnectToProcess(
   *process = base::LaunchProcess(child_command_line, options);
   DCHECK(process->IsValid());
   receiver->SetPID(process->Pid());
-  mojo::edk::ChildProcessLaunched(process->Handle(),
-                                  platform_channel_pair.PassServerHandle(),
-                                  child_token);
+  pending_process.Connect(process->Handle(),
+                          platform_channel_pair.PassServerHandle());
   return connection;
 }