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

services/shell/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/shell/tests/util.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 47 matching lines @@
   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::ScopedMessagePipeHandle pipe =
-      mojo::edk::CreateParentMessagePipe(primordial_pipe_token);
+      mojo::edk::CreateParentMessagePipe(primordial_pipe_token, child_token);
 
   shell::mojom::ShellClientPtr client;
   client.Bind(
       mojo::InterfacePtrInfo<shell::mojom::ShellClient>(std::move(pipe), 0u));
   shell::mojom::PIDReceiverPtr receiver;
 
   shell::Connector::ConnectParams params(target);
   params.set_client_process_connection(std::move(client), GetProxy(&receiver));
   std::unique_ptr<shell::Connection> connection = connector->Connect(&params);
   {
     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());
+                                  platform_channel_pair.PassServerHandle(),
+                                  child_token);
   return connection;
 }
 
 }  // namespace test
 }  // namespace shell