[mojo-edk] Bind a child token to child launches and port reservations.

mojo/edk/test/multiprocess_test_helper.cc

Index: mojo/edk/test/multiprocess_test_helper.cc
diff --git a/mojo/edk/test/multiprocess_test_helper.cc b/mojo/edk/test/multiprocess_test_helper.cc
index 92e2968c03579be13116e8df823baa7b6bcac5b0..763e51a2d25b5aa94dde8ae540ac8a53f4f8ca24 100644
--- a/mojo/edk/test/multiprocess_test_helper.cc
+++ b/mojo/edk/test/multiprocess_test_helper.cc
@@ -116,13 +116,16 @@ ScopedMessagePipeHandle MultiprocessTestHelper::StartChildWithExtraSwitch(
 #error "Not supported yet."
 #endif
 
-  ScopedMessagePipeHandle pipe = CreateParentMessagePipe(pipe_token);
+  std::string child_token = mojo::edk::GenerateRandomToken();
+  ScopedMessagePipeHandle pipe = CreateParentMessagePipe(pipe_token,
+                                                         child_token);
 
   test_child_ =
       base::SpawnMultiProcessTestChild(test_child_main, command_line, options);
   channel.ChildProcessLaunched();
 
-  ChildProcessLaunched(test_child_.Handle(), channel.PassServerHandle());
+  ChildProcessLaunched(test_child_.Handle(), channel.PassServerHandle(),
+                       child_token);
   CHECK(test_child_.IsValid());
 
   return pipe;