Make PlatformChannelPair "dumb".

mojo/edk/embedder/multiprocess_embedder_unittest.cc

Index: mojo/edk/embedder/multiprocess_embedder_unittest.cc
diff --git a/mojo/edk/embedder/multiprocess_embedder_unittest.cc b/mojo/edk/embedder/multiprocess_embedder_unittest.cc
index e848df14a216f4898bc34f2df38854f11490c1e2..ae26a424a27c14c47da9565d3693764710b3ecf5 100644
--- a/mojo/edk/embedder/multiprocess_embedder_unittest.cc
+++ b/mojo/edk/embedder/multiprocess_embedder_unittest.cc
@@ -148,10 +148,10 @@ TEST_F(MultiprocessEmbedderTest, ChannelsBasic) {
                                            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);
 
@@ -194,10 +194,10 @@ TEST_F(MultiprocessEmbedderTest, ChannelsHandlePassing) {
                                            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);
 
@@ -370,7 +370,7 @@ TEST_F(MultiprocessEmbedderTest, ChannelShutdownRace_MessagePipeClose) {
   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();