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

mojo/system/channel.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/channel.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 95 matching lines @@
     DLOG_IF(WARNING, is_shutting_down_)
         << "AttachMessagePipeEndpoint() while shutting down";
 
     while (next_local_id_ == MessageInTransit::kInvalidEndpointId ||
            local_id_to_endpoint_map_.find(next_local_id_) !=
                local_id_to_endpoint_map_.end())
       next_local_id_++;
 
     local_id = next_local_id_;
     next_local_id_++;
-    endpoint = new ChannelEndpoint(message_pipe.get(), port, this, local_id);
+    endpoint = new ChannelEndpoint(message_pipe.get(), port);
     local_id_to_endpoint_map_[local_id] = endpoint;
   }
 
+  endpoint->AttachToChannel(this, local_id);
   // This might fail if that port got an |OnPeerClose()| before attaching.
-  if (message_pipe->Attach(port, scoped_refptr<Channel>(this), local_id))
+  if (message_pipe->Attach(port, endpoint.get(), this, local_id))
     return local_id;
 
   // Note: If it failed, quite possibly the endpoint info was removed from that
   // map (there's a race between us adding it to the map above and calling
   // |Attach()|). And even if an entry exists for |local_id|, we need to check
   // that it's the one we added (and not some other one that was added since).
   {
     base::AutoLock locker(lock_);
     IdToEndpointMap::iterator it = local_id_to_endpoint_map_.find(local_id);
     if (it != local_id_to_endpoint_map_.end() &&
         it->second->message_pipe_.get() == message_pipe.get() &&
         it->second->port_ == port) {
       DCHECK_EQ(it->second->state_, ChannelEndpoint::STATE_NORMAL);
       // TODO(vtl): FIXME -- This is wrong. We need to specify (to
       // |AttachMessagePipeEndpoint()| who's going to be responsible for calling
       // |RunMessagePipeEndpoint()| ("us", or the remote by sending us a
       // |kSubtypeChannelRunMessagePipeEndpoint|). If the remote is going to
       // run, then we'll get messages to an "invalid" local ID (for running, for
       // removal).
       local_id_to_endpoint_map_.erase(it);
     }
   }
   endpoint->DetachFromChannel();
   return MessageInTransit::kInvalidEndpointId;
 }
 
 bool Channel::RunMessagePipeEndpoint(MessageInTransit::EndpointId local_id,
                                      MessageInTransit::EndpointId remote_id) {
+  scoped_refptr<ChannelEndpoint> endpoint;
   ChannelEndpoint::State state;
   scoped_refptr<MessagePipe> message_pipe;
   unsigned port;
   {
     base::AutoLock locker(lock_);
 
     DLOG_IF(WARNING, is_shutting_down_)
         << "RunMessagePipeEndpoint() while shutting down";
 
     IdToEndpointMap::const_iterator it =
         local_id_to_endpoint_map_.find(local_id);
     if (it == local_id_to_endpoint_map_.end())
       return false;
+    endpoint = it->second;
     state = it->second->state_;
     message_pipe = it->second->message_pipe_;
     port = it->second->port_;
   }
 
   // Assume that this was in response to |kSubtypeChannelRunMessagePipeEndpoint|
   // and ignore it.
   if (state != ChannelEndpoint::STATE_NORMAL) {
     DVLOG(2) << "Ignoring run message pipe endpoint for zombie endpoint "
                 "(local ID " << local_id << ", remote ID " << remote_id << ")";
     return true;
   }
 
   // TODO(vtl): FIXME -- We need to handle the case that message pipe is already
   // running when we're here due to |kSubtypeChannelRunMessagePipeEndpoint|).
+  endpoint->Run(remote_id);
+  // TODO(vtl): Get rid of this.
   message_pipe->Run(port, remote_id);
   return true;
 }
 
 void Channel::RunRemoteMessagePipeEndpoint(
     MessageInTransit::EndpointId local_id,
     MessageInTransit::EndpointId remote_id) {
 #if DCHECK_IS_ON
   {
     base::AutoLock locker(lock_);
@@ skipping 358 matching lines @@
   // TODO(vtl): Is this how we really want to handle this?
   // Sometimes we'll want to propagate the error back to the message pipe
   // (endpoint), and notify it that the remote is (effectively) closed.
   // Sometimes we'll want to kill the channel (and notify all the endpoints that
   // their remotes are dead.
   LOG(WARNING) << error_message;
 }
 
 }  // namespace system
 }  // namespace mojo