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

mojo/system/channel_endpoint.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_CHANNEL_ENDPOINT_H_
 #define MOJO_SYSTEM_CHANNEL_ENDPOINT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
@@ skipping 96 matching lines @@
 //         ack" (and it must ack the "remove" message that it received).
 class MOJO_SYSTEM_IMPL_EXPORT ChannelEndpoint
     : public base::RefCountedThreadSafe<ChannelEndpoint> {
  public:
   // TODO(vtl): More comments....
   // The caller must keep |channel| alive until the |Channel| has taken
   // ownership of a reference to the created object. (TODO(vtl): Convert
   // |Channel::AttachMessagePipeEndpoint()| to a |Channel::AttachEndpoint()|
   // that takes a |ChannelEndpoint|, and move |ChannelEndpoint| creation out of
   // |Channel|.)
-  ChannelEndpoint(MessagePipe* message_pipe,
-                  unsigned port,
-                  Channel* channel,
-                  MessageInTransit::EndpointId local_id);
+  ChannelEndpoint(MessagePipe* message_pipe, unsigned port);
+
+  void AttachToChannel(Channel* channel, MessageInTransit::EndpointId local_id);
+  void Run(MessageInTransit::EndpointId remote_id);
 
   // Called by |Channel| before it gives up its reference to this object.
   void DetachFromChannel();
 
  private:
   enum State {
     // Attached, possibly running or not.
     STATE_NORMAL,
     // "Zombie" states:
     // Waiting for |DetachMessagePipeEndpoint()| before removing.
     STATE_WAIT_LOCAL_DETACH,
     // Waiting for a |kSubtypeChannelRemoveMessagePipeEndpointAck| before
     // removing.
     STATE_WAIT_REMOTE_REMOVE_ACK,
   };
 
   // TODO(vtl): This is totally temporary, until this becomes a proper
   // self-contained class. See the plan above.
   friend class Channel;
 
   friend class base::RefCountedThreadSafe<ChannelEndpoint>;
   ~ChannelEndpoint();
 
   State state_;
+  // TODO(vtl): When moved under lock, this can/should be made a raw pointer.
   scoped_refptr<MessagePipe> message_pipe_;
   unsigned port_;
 
   // TODO(vtl): Move the things above under lock.
   // Protects the members below.
   base::Lock lock_;
 
-  // |channel_| must be alive whenever this is nonnull. Before the |channel_|
+  // |channel_| must be alive whenever this is non-null. Before the |channel_|
   // gives up its reference to this object, it will call |DetachFromChannel()|.
   Channel* channel_;
   MessageInTransit::EndpointId local_id_;
-  // TODO(vtl):
-  // MessageInTransit::EndpointId remote_id_;
+  MessageInTransit::EndpointId remote_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelEndpoint);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_CHANNEL_ENDPOINT_H_