Mojo: Remove ProxyMessagePipeEndpoint::Run(), etc.

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/channel_endpoint.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/message_in_transit.h"
@@ skipping 140 matching lines @@
   endpoints_[port]->RemoveWaiter(waiter, signals_state);
 }
 
 scoped_refptr<ChannelEndpoint> MessagePipe::ConvertLocalToProxy(unsigned port) {
   DCHECK(port == 0 || port == 1);
 
   base::AutoLock locker(lock_);
   DCHECK(endpoints_[port]);
   DCHECK_EQ(endpoints_[port]->GetType(), MessagePipeEndpoint::kTypeLocal);
 
-  bool is_peer_open = !!endpoints_[GetPeerPort(port)];
-
   // TODO(vtl): Allowing this case is a temporary hack. It'll set up a
   // |MessagePipe| with two proxy endpoints, which will then act as a proxy
   // (rather than trying to connect the two ends directly).
   DLOG_IF(WARNING,
-          is_peer_open &&
+          !!endpoints_[GetPeerPort(port)] &&
               endpoints_[GetPeerPort(port)]->GetType() !=
                   MessagePipeEndpoint::kTypeLocal)
       << "Direct message pipe passing across multiple channels not yet "
          "implemented; will proxy";
 
   scoped_ptr<MessagePipeEndpoint> old_endpoint(endpoints_[port].Pass());
   scoped_refptr<ChannelEndpoint> channel_endpoint(
       new ChannelEndpoint(this, port));
-  endpoints_[port].reset(
-      new ProxyMessagePipeEndpoint(channel_endpoint.get(), is_peer_open));
+  endpoints_[port].reset(new ProxyMessagePipeEndpoint(channel_endpoint.get()));
   channel_endpoint->TakeMessages(static_cast<LocalMessagePipeEndpoint*>(
                                      old_endpoint.get())->message_queue());
   old_endpoint->Close();
 
   return channel_endpoint;
 }
 
 MojoResult MessagePipe::EnqueueMessage(unsigned port,
                                        scoped_ptr<MessageInTransit> message) {
   return EnqueueMessageInternal(port, message.Pass(), nullptr);
 }
 
-void MessagePipe::Run(unsigned port) {
-  DCHECK(port == 0 || port == 1);
-
-  base::AutoLock locker(lock_);
-  DCHECK(endpoints_[port]);
-  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;
 
   endpoints_[port]->OnRemove();
   if (endpoints_[destination_port]) {
@@ 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