Mojo: Remove knowledge of Channel, etc. from ProxyMessagePipeEndpoint.

mojo/system/message_pipe.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/message_pipe.h"
 
 #include "base/logging.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_pipe_dispatcher.h"
@@ skipping 158 matching lines @@
           static_cast<LocalMessagePipeEndpoint*>(endpoints_[port].get()),
           is_peer_open));
   endpoints_[port].swap(replacement_endpoint);
 }
 
 MojoResult MessagePipe::EnqueueMessage(unsigned port,
                                        scoped_ptr<MessageInTransit> message) {
   return EnqueueMessageInternal(port, message.Pass(), NULL);
 }
 
-bool MessagePipe::Attach(unsigned port,
-                         ChannelEndpoint* channel_endpoint,
-                         Channel* channel,
-                         MessageInTransit::EndpointId local_id) {
+bool MessagePipe::Attach(unsigned port, ChannelEndpoint* channel_endpoint) {
   DCHECK(port == 0 || port == 1);
   DCHECK(channel_endpoint);
-  DCHECK(channel);
-  DCHECK_NE(local_id, MessageInTransit::kInvalidEndpointId);
 
   base::AutoLock locker(lock_);
   if (!endpoints_[port])
     return false;
 
   DCHECK_EQ(endpoints_[port]->GetType(), MessagePipeEndpoint::kTypeProxy);
-  endpoints_[port]->Attach(channel_endpoint, channel, local_id);
+  endpoints_[port]->Attach(channel_endpoint);
   return true;
 }
 
-void MessagePipe::Run(unsigned port, MessageInTransit::EndpointId remote_id) {
+void MessagePipe::Run(unsigned port) {
   DCHECK(port == 0 || port == 1);
-  DCHECK_NE(remote_id, MessageInTransit::kInvalidEndpointId);
 
   base::AutoLock locker(lock_);
   DCHECK(endpoints_[port]);
-  if (!endpoints_[port]->Run(remote_id))
+  if (!endpoints_[port]->Run())
     endpoints_[port].reset();
 }
 
 void MessagePipe::OnRemove(unsigned port) {
   unsigned destination_port = GetPeerPort(port);
 
   base::AutoLock locker(lock_);
   // A |OnPeerClose()| can come in first, before |OnRemove()| gets called.
   if (!endpoints_[port])
     return;
@@ skipping 93 matching lines @@
 MojoResult MessagePipe::HandleControlMessage(
     unsigned /*port*/,
     scoped_ptr<MessageInTransit> message) {
   LOG(WARNING) << "Unrecognized MessagePipe control message subtype "
                << message->subtype();
   return MOJO_RESULT_UNKNOWN;
 }
 
 }  // namespace system
 }  // namespace mojo