Mojo: Give ChannelEndpoint the remote ID and ProxyMessagePipeEndpoint the ChannelEndpoint.

mojo/system/message_pipe_endpoint.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_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
 #define MOJO_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/system/dispatcher.h"
 #include "mojo/system/memory.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
+class ChannelEndpoint;
 class Waiter;
 
 // This is an interface to one of the ends of a message pipe, and is used by
 // |MessagePipe|. Its most important role is to provide a sink for messages
 // (i.e., a place where messages can be sent). It has a secondary role: When the
 // endpoint is local (i.e., in the current process), there'll be a dispatcher
 // corresponding to the endpoint. In that case, the implementation of
 // |MessagePipeEndpoint| also implements the functionality required by the
 // dispatcher, e.g., to read messages and to wait. Implementations of this class
 // are not thread-safe; instances are protected by |MesssagePipe|'s lock.
@@ skipping 31 matching lines @@
   virtual HandleSignalsState GetHandleSignalsState() const;
   virtual MojoResult AddWaiter(Waiter* waiter,
                                MojoHandleSignals signals,
                                uint32_t context,
                                HandleSignalsState* signals_state);
   virtual void RemoveWaiter(Waiter* waiter, HandleSignalsState* signals_state);
 
   // Implementations must override these if they represent a proxy endpoint. An
   // implementation for a local endpoint needs not override these methods, since
   // they should never be called.
-  virtual void Attach(scoped_refptr<Channel> channel,
+  virtual void Attach(ChannelEndpoint* channel_endpoint,
+                      Channel* channel,
                       MessageInTransit::EndpointId local_id);
   // Returns false if the endpoint should be closed and destroyed, else true.
   virtual bool Run(MessageInTransit::EndpointId remote_id);
   virtual void OnRemove();
 
  protected:
   MessagePipeEndpoint() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MessagePipeEndpoint);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_MESSAGE_PIPE_ENDPOINT_H_