Mojo: Refactor PlatformChannel stuff.

mojo/system/remote_message_pipe_posix_unittest.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.
 
 // TODO(vtl): The POSIX-specific bits have been factored out. Apply this test to
 // non-POSIX once we have a non-POSIX implementation.
 
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 73 matching lines @@
   }
 
   scoped_refptr<base::TaskRunner> io_thread_task_runner() {
     return io_thread_message_loop()->message_loop_proxy();
   }
 
  private:
   void SetUpOnIOThread() {
     CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
 
-    scoped_ptr<PlatformServerChannel> server_channel(
-        PlatformServerChannel::Create("channel"));
-    CHECK(server_channel.get());
-    CHECK(server_channel->is_valid());
-    scoped_ptr<PlatformClientChannel> client_channel(
-        server_channel->CreateClientChannel());
-    CHECK(client_channel.get());
-    CHECK(client_channel->is_valid());
-
-    platform_channels_[0] = server_channel.PassAs<PlatformChannel>();
-    platform_channels_[1] = client_channel.PassAs<PlatformChannel>();
+    PlatformChannelPair channel_pair;
+    platform_channels_[0] = channel_pair.CreateServerChannel();
+    CHECK(platform_channels_[0].get());
+    CHECK(platform_channels_[0]->is_valid());
+    platform_channels_[1] = channel_pair.CreateClientChannel();
+    CHECK(platform_channels_[1].get());
+    CHECK(platform_channels_[1]->is_valid());
   }
 
   void CreateAndInitChannel(unsigned channel_index) {
     CHECK_EQ(base::MessageLoop::current(), io_thread_message_loop());
     CHECK(channel_index == 0 || channel_index == 1);
     CHECK(!channels_[channel_index].get());
 
     channels_[channel_index] = new Channel();
     CHECK(channels_[channel_index]->Init(
         platform_channels_[channel_index]->PassHandle()));
@@ skipping 309 matching lines @@
                               MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(sizeof(hello), static_cast<size_t>(buffer_size));
   EXPECT_EQ(0, strcmp(buffer, hello));
 
   // And MP 1, port 1.
   mp_1->Close(1);
 }
 }  // namespace
 }  // namespace system
 }  // namespace mojo