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

mojo/system/proxy_message_pipe_endpoint.cc

 // 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.
 
 #include "mojo/system/proxy_message_pipe_endpoint.h"
 
 #include <string.h>
 
 #include "base/logging.h"
 #include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_pipe_dispatcher.h"
 
 namespace mojo {
 namespace system {
 
 ProxyMessagePipeEndpoint::ProxyMessagePipeEndpoint()
     : local_id_(MessageInTransit::kInvalidEndpointId),
       remote_id_(MessageInTransit::kInvalidEndpointId),
       is_peer_open_(true) {
@@ skipping 53 matching lines @@
 
     message->set_source_id(local_id_);
     message->set_destination_id(remote_id_);
     if (!channel_->WriteMessage(message.Pass()))
       LOG(WARNING) << "Failed to write message to channel";
   } else {
     paused_message_queue_.AddMessage(message.Pass());
   }
 }
 
-void ProxyMessagePipeEndpoint::Attach(scoped_refptr<Channel> channel,
+void ProxyMessagePipeEndpoint::Attach(ChannelEndpoint* channel_endpoint,
+                                      Channel* channel,
                                       MessageInTransit::EndpointId local_id) {
-  DCHECK(channel.get());
+  DCHECK(channel_endpoint);
+  DCHECK(channel);
   DCHECK_NE(local_id, MessageInTransit::kInvalidEndpointId);
 
   DCHECK(!is_attached());
 
   AssertConsistentState();
+  channel_endpoint_ = channel_endpoint;
   channel_ = channel;
   local_id_ = local_id;
   AssertConsistentState();
 }
 
 bool ProxyMessagePipeEndpoint::Run(MessageInTransit::EndpointId remote_id) {
   // Assertions about arguments:
   DCHECK_NE(remote_id, MessageInTransit::kInvalidEndpointId);
 
   // Assertions about current state:
@@ skipping 18 matching lines @@
 void ProxyMessagePipeEndpoint::OnRemove() {
   Detach();
 }
 
 void ProxyMessagePipeEndpoint::Detach() {
   DCHECK(is_attached());
 
   AssertConsistentState();
   channel_->DetachMessagePipeEndpoint(local_id_, remote_id_);
   channel_ = NULL;
+  // TODO(vtl): Inform |channel_endpoint_| that we were detached.
+  channel_endpoint_ = NULL;
   local_id_ = MessageInTransit::kInvalidEndpointId;
   remote_id_ = MessageInTransit::kInvalidEndpointId;
   paused_message_queue_.Clear();
   AssertConsistentState();
 }
 
 #ifndef NDEBUG
 void ProxyMessagePipeEndpoint::AssertConsistentState() const {
   if (is_attached()) {
     DCHECK_NE(local_id_, MessageInTransit::kInvalidEndpointId);
   } else {  // Not attached.
     DCHECK_EQ(local_id_, MessageInTransit::kInvalidEndpointId);
     DCHECK_EQ(remote_id_, MessageInTransit::kInvalidEndpointId);
   }
 }
 #endif
 
 }  // namespace system
 }  // namespace mojo