Make PlatformChannelPair "dumb".

mojo/edk/system/channel_manager_unittest.cc

 // Copyright 2014 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/system/channel_manager.h"
 
 #include <functional>
 #include <memory>
 #include <utility>
 
@@ skipping 51 matching lines @@
   ChannelManager channel_manager_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelManagerTest);
 };
 
 TEST_F(ChannelManagerTest, Basic) {
   embedder::PlatformChannelPair channel_pair;
 
   const ChannelId id = 1;
   RefPtr<MessagePipeDispatcher> d = channel_manager().CreateChannelOnIOThread(
-      id, channel_pair.PassServerHandle());
+      id, channel_pair.handle0.Pass());
 
   RefPtr<Channel> ch = channel_manager().GetChannel(id);
   EXPECT_TRUE(ch);
   // |ChannelManager| should have a ref.
   EXPECT_FALSE(ch->HasOneRef());
 
   channel_manager().WillShutdownChannel(id);
   // |ChannelManager| should still have a ref.
   EXPECT_FALSE(ch->HasOneRef());
 
   channel_manager().ShutdownChannelOnIOThread(id);
   // |ChannelManager| should have given up its ref.
   EXPECT_TRUE(ch->HasOneRef());
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 }
 
 TEST_F(ChannelManagerTest, TwoChannels) {
   embedder::PlatformChannelPair channel_pair;
 
   const ChannelId id1 = 1;
   RefPtr<MessagePipeDispatcher> d1 = channel_manager().CreateChannelOnIOThread(
-      id1, channel_pair.PassServerHandle());
+      id1, channel_pair.handle0.Pass());
 
   const ChannelId id2 = 2;
   RefPtr<MessagePipeDispatcher> d2 = channel_manager().CreateChannelOnIOThread(
-      id2, channel_pair.PassClientHandle());
+      id2, channel_pair.handle1.Pass());
 
   RefPtr<Channel> ch1 = channel_manager().GetChannel(id1);
   EXPECT_TRUE(ch1);
 
   RefPtr<Channel> ch2 = channel_manager().GetChannel(id2);
   EXPECT_TRUE(ch2);
 
   // Calling |WillShutdownChannel()| multiple times (on |id1|) is okay.
   channel_manager().WillShutdownChannel(id1);
   channel_manager().WillShutdownChannel(id1);
@@ skipping 54 matching lines @@
   std::function<void()> quit_closure_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(OtherThread);
 };
 
 TEST_F(ChannelManagerTest, CallsFromOtherThread) {
   embedder::PlatformChannelPair channel_pair;
 
   const ChannelId id = 1;
   RefPtr<MessagePipeDispatcher> d = channel_manager().CreateChannelOnIOThread(
-      id, channel_pair.PassServerHandle());
+      id, channel_pair.handle0.Pass());
 
   OtherThread thread(task_runner().Clone(), &channel_manager(), id,
                      [this]() { message_loop()->QuitNow(); });
   thread.Start();
   message_loop()->Run();
   thread.Join();
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 }
 
 // TODO(vtl): Test |CreateChannelWithoutBootstrapOnIOThread()|. (This will
 // require additional functionality in |Channel|.)
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo