Mojo EDK: Add safe process connection API

services/service_manager/tests/util.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/tests/util.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
     child_command_line.AppendSwitch(switches::kWaitForDebugger);
   }
 
   // Create the channel to be shared with the target process. Pass one end
   // on the command line.
   mojo::edk::PlatformChannelPair platform_channel_pair;
   mojo::edk::HandlePassingInformation handle_passing_info;
   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>(
       std::move(pipe), 0u));
   service_manager::mojom::PIDReceiverPtr receiver;
 
   connector->StartService(target, std::move(client), MakeRequest(&receiver));
   std::unique_ptr<service_manager::Connection> connection =
       connector->Connect(target);
   {
     base::RunLoop loop;
     connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
     base::MessageLoop::ScopedNestableTaskAllower allow(
         base::MessageLoop::current());
     loop.Run();
   }
 
   base::LaunchOptions options;
 #if defined(OS_WIN)
   options.handles_to_inherit = &handle_passing_info;
 #elif defined(OS_POSIX)
   options.fds_to_remap = &handle_passing_info;
 #endif
   *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;
 }
 
 }  // namespace test
 }  // namespace service_manager