Mojo: Refactor PlatformChannel stuff.

mojo/system/raw_channel_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): Factor out the remaining POSIX-specific bits of this test (once we
 // have a non-POSIX implementation).
 
 #include "mojo/system/raw_channel.h"
 
 #include <fcntl.h>
@@ skipping 59 matching lines @@
   RawChannelPosixTest() : io_thread_("io_thread") {
   }
 
   virtual ~RawChannelPosixTest() {
   }
 
   virtual void SetUp() OVERRIDE {
     io_thread_.StartWithOptions(
         base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 
-    scoped_ptr<PlatformServerChannel> server_channel(
-        PlatformServerChannel::Create("channel"));
+    PlatformChannelPair channel_pair;
+    scoped_ptr<PlatformChannel> server_channel(
+        channel_pair.CreateServerChannel());
     CHECK(server_channel.get());
     CHECK(server_channel->is_valid());
-    scoped_ptr<PlatformClientChannel> client_channel(
-        server_channel->CreateClientChannel());
+    scoped_ptr<PlatformChannel> client_channel(
+        channel_pair.CreateClientChannel());
     CHECK(client_channel.get());
     CHECK(client_channel->is_valid());
 
     handles_[0] = server_channel->PassHandle();
     handles_[1] = client_channel->PassHandle();
   }
 
   virtual void TearDown() OVERRIDE {
     if (handles_[0].is_valid())
       close(handles_[0].fd);
@@ skipping 463 matching lines @@
                         FROM_HERE,
                         base::Bind(&RawChannel::Shutdown,
                                    base::Unretained(rc.get())));
 
   EXPECT_FALSE(rc->WriteMessage(MakeTestMessage(1)));
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo