Mojo: Refactor PlatformChannel stuff.

mojo/common/test/multiprocess_test_base.h

Index: mojo/common/test/multiprocess_test_base.h
diff --git a/mojo/common/test/multiprocess_test_base.h b/mojo/common/test/multiprocess_test_base.h
index c983df23ee71c77a053ce31b61c0e83e1a08aeb0..9729191ed744bbf551f5bfe0ace28f0da1d9765b 100644
--- a/mojo/common/test/multiprocess_test_base.h
+++ b/mojo/common/test/multiprocess_test_base.h
@@ -40,15 +40,17 @@ class MultiprocessTestBase : public base::MultiProcessTest {
   static void ChildSetup();
 
   // For use in the main process:
-  scoped_ptr<system::PlatformServerChannel> platform_server_channel;
+  scoped_ptr<system::PlatformChannel> server_platform_channel;
 
   // For use (and only valid) in the child process:
-  static scoped_ptr<system::PlatformClientChannel> platform_client_channel;
+  static scoped_ptr<system::PlatformChannel> client_platform_channel;
 
  private:
   virtual CommandLine MakeCmdLine(const std::string& procname,
                                   bool debug_on_start) OVERRIDE;
 
+  scoped_ptr<system::PlatformChannelPair> platform_channel_pair_;
+
   // Valid after |StartChild()| and before |WaitForChildShutdown()|.
   base::ProcessHandle test_child_handle_;