Mojo: Have |ProxyMessagePipeEndpoint|s constructed with a |ChannelEndpoint|.

mojo/system/message_pipe_test_utils.h

 // Copyright 2014 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_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
 #define MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
 
 #include "base/test/test_io_thread.h"
 #include "mojo/common/test/multiprocess_test_helper.h"
 #include "mojo/embedder/simple_platform_support.h"
 #include "mojo/system/channel.h"
-#include "mojo/system/message_pipe.h"
 #include "mojo/system/test_utils.h"
 
 namespace mojo {
 namespace system {
+
+class Channel;
+class ChannelEndpoint;
+class MessagePipe;
+
 namespace test {
 
 MojoResult WaitIfNecessary(scoped_refptr<MessagePipe> mp,
                            MojoHandleSignals signals,
                            HandleSignalsState* signals_state);
 
 class ChannelThread {
  public:
   explicit ChannelThread(embedder::PlatformSupport* platform_support);
   ~ChannelThread();
 
   void Start(embedder::ScopedPlatformHandle platform_handle,
-             scoped_refptr<MessagePipe> message_pipe);
+             scoped_refptr<ChannelEndpoint> channel_endpoint);
   void Stop();
 
  private:
   void InitChannelOnIOThread(embedder::ScopedPlatformHandle platform_handle,
-                             scoped_refptr<MessagePipe> message_pipe);
+                             scoped_refptr<ChannelEndpoint> channel_endpoint);
   void ShutdownChannelOnIOThread();
 
   embedder::PlatformSupport* const platform_support_;
   base::TestIOThread test_io_thread_;
   scoped_refptr<Channel> channel_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelThread);
 };
 
 #if !defined(OS_IOS)
 class MultiprocessMessagePipeTestBase : public testing::Test {
  public:
   MultiprocessMessagePipeTestBase();
   virtual ~MultiprocessMessagePipeTestBase();
 
  protected:
-  void Init(scoped_refptr<MessagePipe> mp);
+  void Init(scoped_refptr<ChannelEndpoint> ep);
 
   embedder::PlatformSupport* platform_support() { return &platform_support_; }
   mojo::test::MultiprocessTestHelper* helper() { return &helper_; }
 
  private:
   embedder::SimplePlatformSupport platform_support_;
   ChannelThread channel_thread_;
   mojo::test::MultiprocessTestHelper helper_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiprocessMessagePipeTestBase);
 };
 #endif
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_MESSAGE_PIPE_TEST_HELPER_H_