Mojo: Refactor PlatformChannel stuff.

mojo/system/multiprocess_message_pipe_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): Enable this on non-POSIX once we have a non-POSIX implementation.
 #include "build/build_config.h"
 #if defined(OS_POSIX)
 
 #include <stdint.h>
 
@@ skipping 104 matching lines @@
   MultiprocessMessagePipeTest() {}
   virtual ~MultiprocessMessagePipeTest() {}
 
   virtual void TearDown() OVERRIDE {
     if (io_thread_wrapper_.is_initialized())
       io_thread_wrapper_.Shutdown();
     mojo::test::MultiprocessTestBase::TearDown();
   }
 
   void Init(scoped_refptr<MessagePipe> mp) {
-    io_thread_wrapper_.Init(platform_server_channel.get(), mp);
+    io_thread_wrapper_.Init(server_platform_channel.get(), mp);
   }
 
  private:
   IOThreadWrapper io_thread_wrapper_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiprocessMessagePipeTest);
 };
 
 MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp, MojoWaitFlags flags) {
   Waiter waiter;
   waiter.Init();
 
   MojoResult add_result = mp->AddWaiter(0, &waiter, flags, MOJO_RESULT_OK);
   if (add_result != MOJO_RESULT_OK) {
     return (add_result == MOJO_RESULT_ALREADY_EXISTS) ? MOJO_RESULT_OK :
                                                         add_result;
   }
 
   MojoResult wait_result = waiter.Wait(MOJO_DEADLINE_INDEFINITE);
   mp->RemoveWaiter(0, &waiter);
   return wait_result;
 }
 
 // For each message received, sends a reply message with the same contents
 // repeated twice, until the other end is closed or it receives "quitquitquit"
 // (which it doesn't reply to). It'll return the number of messages received,
 // not including any "quitquitquit" message, modulo 100.
 MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) {
   IOThreadWrapper io_thread_wrapper;
-  PlatformClientChannel* const platform_client_channel =
-      MultiprocessMessagePipeTest::platform_client_channel.get();
-  CHECK(platform_client_channel);
-  CHECK(platform_client_channel->is_valid());
+  PlatformChannel* const client_platform_channel =
+      MultiprocessMessagePipeTest::client_platform_channel.get();
+  CHECK(client_platform_channel);
+  CHECK(client_platform_channel->is_valid());
   scoped_refptr<MessagePipe> mp(new MessagePipe(
       scoped_ptr<MessagePipeEndpoint>(new LocalMessagePipeEndpoint()),
       scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint())));
-  io_thread_wrapper.Init(platform_client_channel, mp);
+  io_thread_wrapper.Init(client_platform_channel, mp);
 
   const std::string quitquitquit("quitquitquit");
   int rv = 0;
   for (;; rv = (rv + 1) % 100) {
     // Wait for our end of the message pipe to be readable.
     MojoResult result = WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE);
     if (result != MOJO_RESULT_OK) {
       // It was closed, probably.
       CHECK_EQ(result, MOJO_RESULT_FAILED_PRECONDITION);
       break;
@@ skipping 116 matching lines @@
   mp->Close(0);
 
   EXPECT_EQ(static_cast<int>(kNumMessages % 100), WaitForChildShutdown());
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo
 
 #endif  // defined(OS_POSIX)