Mojo: Refactor PlatformChannel stuff.

mojo/common/test/multiprocess_test_base.h

 // 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.
 
 #ifndef MOJO_COMMON_TEST_MULTIPROCESS_TEST_BASE_H_
 #define MOJO_COMMON_TEST_MULTIPROCESS_TEST_BASE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
   // to be an |int|, the exit code is subject to mangling by the OS. E.g., we
   // usually return -1 on error in the child (e.g., if |test_child_name| was not
   // found), but this is mangled to 255 on Linux. You should only rely on codes
   // 0-127 being preserved, and -1 being outside the range 0-127.
   int WaitForChildShutdown();
 
   // For use by |MOJO_MULTIPROCESS_TEST_CHILD_MAIN()| only:
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiprocessTestBase);
 };
 
 // Use this to declare the child process's "main()" function for tests using
 // |MultiprocessTestBase|. It returns an |int|, which will be the process's exit
 // code (but see the comment about |WaitForChildShutdown()|).
 #define MOJO_MULTIPROCESS_TEST_CHILD_MAIN(test_child_name) \
     MULTIPROCESS_TEST_MAIN_WITH_SETUP( \
         test_child_name ## TestChildMain, \
         ::mojo::test::MultiprocessTestBase::ChildSetup)
 
 }  // namespace test
 }  // namespace mojo
 
 #endif  // MOJO_COMMON_TEST_MULTIPROCESS_TEST_BASE_H_