Mojo: Refactor PlatformChannel stuff.

mojo/system/raw_channel_posix_unittest.cc

Index: mojo/system/raw_channel_posix_unittest.cc
diff --git a/mojo/system/raw_channel_posix_unittest.cc b/mojo/system/raw_channel_posix_unittest.cc
index a580d24f2af5c701e540463f03d46ba448dea71f..b93ba9ad94858b121f5acf94c0d9b9d800e79224 100644
--- a/mojo/system/raw_channel_posix_unittest.cc
+++ b/mojo/system/raw_channel_posix_unittest.cc
@@ -77,12 +77,13 @@ class RawChannelPosixTest : public testing::Test {
     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());