Mojo EDK: Add safe process connection API

services/service_manager/tests/service_manager/service_manager_unittest.cc

Index: services/service_manager/tests/service_manager/service_manager_unittest.cc
diff --git a/services/service_manager/tests/service_manager/service_manager_unittest.cc b/services/service_manager/tests/service_manager/service_manager_unittest.cc
index 39a21ecad3a208d4cb9aba1b898277f7b6266e4e..5f843b589b41c8d0f9287a0f98a655a3848a5bf5 100644
--- a/services/service_manager/tests/service_manager/service_manager_unittest.cc
+++ b/services/service_manager/tests/service_manager/service_manager_unittest.cc
@@ -20,6 +20,7 @@
 #include "base/process/process_handle.h"
 #include "base/run_loop.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 "mojo/public/cpp/bindings/binding_set.h"
@@ -176,10 +177,10 @@ class ServiceManagerTest : public test::ServiceTest,
     platform_channel_pair.PrepareToPassClientHandleToChildProcess(
         &child_command_line, &handle_passing_info);
 
-    std::string child_token = mojo::edk::GenerateRandomToken();
+    mojo::edk::PendingProcessConnection process_connection;
     service_manager::mojom::ServicePtr client =
-        service_manager::PassServiceRequestOnCommandLine(&child_command_line,
-                                                         child_token);
+        service_manager::PassServiceRequestOnCommandLine(process_connection,
+                                                         &child_command_line);
     service_manager::mojom::PIDReceiverPtr receiver;
 
     service_manager::Identity target("service_manager_unittest_target",
@@ -201,9 +202,8 @@ class ServiceManagerTest : public test::ServiceTest,
     target_ = base::LaunchProcess(child_command_line, options);
     DCHECK(target_.IsValid());
     receiver->SetPID(target_.Pid());
-    mojo::edk::ChildProcessLaunched(target_.Handle(),
-                                    platform_channel_pair.PassServerHandle(),
-                                    child_token);
+    process_connection.Connect(target_.Handle(),
+                               platform_channel_pair.PassServerHandle());
   }
 
   void KillTarget() {