Make PlatformChannelPair "dumb".

mojo/edk/embedder/multiprocess_embedder_unittest.cc

 // Copyright 2015 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/embedder/multiprocess_embedder.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 130 matching lines @@
   TestIOThread test_io_thread_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MultiprocessEmbedderTest);
 };
 
 TEST_F(MultiprocessEmbedderTest, ChannelsBasic) {
   mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner().Clone(),
                                            test_io_watcher());
 
   PlatformChannelPair channel_pair;
-  ScopedTestChannel server_channel(channel_pair.PassServerHandle());
+  ScopedTestChannel server_channel(channel_pair.handle0.Pass());
   MojoHandle server_mp = server_channel.bootstrap_message_pipe();
   EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-  ScopedTestChannel client_channel(channel_pair.PassClientHandle());
+  ScopedTestChannel client_channel(channel_pair.handle1.Pass());
   MojoHandle client_mp = client_channel.bootstrap_message_pipe();
   EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
 
   // We can write to a message pipe handle immediately.
   const char kHello[] = "hello";
   EXPECT_EQ(
       MOJO_RESULT_OK,
       MojoWriteMessage(server_mp, kHello, static_cast<uint32_t>(sizeof(kHello)),
                        nullptr, 0, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
@@ skipping 22 matching lines @@
   client_channel.WaitForChannelCreationCompletion();
   EXPECT_TRUE(server_channel.channel_info());
   EXPECT_TRUE(client_channel.channel_info());
 }
 
 TEST_F(MultiprocessEmbedderTest, ChannelsHandlePassing) {
   mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner().Clone(),
                                            test_io_watcher());
 
   PlatformChannelPair channel_pair;
-  ScopedTestChannel server_channel(channel_pair.PassServerHandle());
+  ScopedTestChannel server_channel(channel_pair.handle0.Pass());
   MojoHandle server_mp = server_channel.bootstrap_message_pipe();
   EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
-  ScopedTestChannel client_channel(channel_pair.PassClientHandle());
+  ScopedTestChannel client_channel(channel_pair.handle1.Pass());
   MojoHandle client_mp = client_channel.bootstrap_message_pipe();
   EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
 
   MojoHandle h0, h1;
   EXPECT_EQ(MOJO_RESULT_OK, MojoCreateMessagePipe(nullptr, &h0, &h1));
 
   // Write a message to |h0| (attaching nothing).
   const char kHello[] = "hello";
   EXPECT_EQ(MOJO_RESULT_OK,
             MojoWriteMessage(h0, kHello, static_cast<uint32_t>(sizeof(kHello)),
@@ skipping 152 matching lines @@
 }
 
 TEST_F(MultiprocessEmbedderTest, ChannelShutdownRace_MessagePipeClose) {
   const size_t kIterations = 1000;
   mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner().Clone(),
                                            test_io_watcher());
 
   for (size_t i = 0; i < kIterations; i++) {
     PlatformChannelPair channel_pair;
     std::unique_ptr<ScopedTestChannel> server_channel(
-        new ScopedTestChannel(channel_pair.PassServerHandle()));
+        new ScopedTestChannel(channel_pair.handle0.Pass()));
     server_channel->WaitForChannelCreationCompletion();
     server_channel->NoWaitOnShutdown();
 
     MojoHandle server_mp = server_channel->bootstrap_message_pipe();
     EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
 
     // Race between channel shutdown and closing a message pipe. The message
     // pipe doesn't have to be the bootstrap pipe. It just has to be bound to
     // the channel.
     server_channel.reset();
@@ skipping 314 matching lines @@
 
   EXPECT_TRUE(test::Shutdown());
 }
 
 // TODO(vtl): Test immediate write & close.
 // TODO(vtl): Test broken-connection cases.
 
 }  // namespace
 }  // namespace embedder
 }  // namespace mojo