Add mojo::edk::ClosePeerConnection.

mojo/edk/test/multiprocess_test_helper.cc

 // Copyright 2013 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 "mojo/edk/test/multiprocess_test_helper.h"
 
 #include <functional>
 #include <set>
 #include <utility>
 
@@ skipping 128 matching lines @@
 #else
 #error "Not supported yet."
 #endif
 
   ScopedMessagePipeHandle pipe;
   std::string child_token = mojo::edk::GenerateRandomToken();
   if (launch_type == LaunchType::CHILD ||
       launch_type == LaunchType::NAMED_CHILD) {
     pipe = CreateParentMessagePipe(pipe_token, child_token);
   } else if (launch_type == LaunchType::PEER) {
-    pipe = ConnectToPeerProcess(channel.PassServerHandle());
+    peer_token_ = mojo::edk::GenerateRandomToken();
+    pipe = ConnectToPeerProcess(channel.PassServerHandle(), peer_token_);
   } else if (launch_type == LaunchType::NAMED_PEER) {
-    pipe = ConnectToPeerProcess(CreateServerHandle(named_pipe));
+    peer_token_ = mojo::edk::GenerateRandomToken();
+    pipe = ConnectToPeerProcess(CreateServerHandle(named_pipe), peer_token_);
   }
 
   test_child_ =
       base::SpawnMultiProcessTestChild(test_child_main, command_line, options);
   if (launch_type == LaunchType::CHILD || launch_type == LaunchType::PEER)
     channel.ChildProcessLaunched();
 
   if (launch_type == LaunchType::CHILD) {
     ChildProcessLaunched(test_child_.Handle(), channel.PassServerHandle(),
                          child_token, process_error_callback_);
@@ skipping 15 matching lines @@
   CHECK(AndroidWaitForChildExitWithTimeout(
       test_child_, TestTimeouts::action_timeout(), &rv));
 #else
   CHECK(
       test_child_.WaitForExitWithTimeout(TestTimeouts::action_timeout(), &rv));
 #endif
   test_child_.Close();
   return rv;
 }
 
+void MultiprocessTestHelper::ClosePeerConnection() {
+  DCHECK(!peer_token_.empty());
+  ::mojo::edk::ClosePeerConnection(peer_token_);
+  peer_token_.clear();
+}
+
 bool MultiprocessTestHelper::WaitForChildTestShutdown() {
   return WaitForChildShutdown() == 0;
 }
 
 // static
 void MultiprocessTestHelper::ChildSetup() {
   CHECK(base::CommandLine::InitializedForCurrentProcess());
 
   std::string primordial_pipe_token =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
@@ skipping 41 matching lines @@
             ::testing::Test::HasNonfatalFailure()) ? 1 : 0;
   });
 }
 
 // static
 mojo::ScopedMessagePipeHandle MultiprocessTestHelper::primordial_pipe;
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo