Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b

mojo/edk/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/edk/system/message_pipe.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/local_message_pipe_endpoint.h"
 #include "mojo/edk/system/message_in_transit.h"
@@ skipping 143 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);
 
+  // The local peer is already closed, so just make a |ChannelEndpoint| that'll
+  // send the already-queued messages.
+  if (!endpoints_[GetPeerPort(port)]) {
+    scoped_refptr<ChannelEndpoint> channel_endpoint(new ChannelEndpoint(
+        nullptr,
+        0,
+        static_cast<LocalMessagePipeEndpoint*>(endpoints_[port].get())
+            ->message_queue()));
+    endpoints_[port]->Close();
+    endpoints_[port].reset();
+    return channel_endpoint;
+  }
+
   // 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,
-          !!endpoints_[GetPeerPort(port)] &&
-              endpoints_[GetPeerPort(port)]->GetType() !=
-                  MessagePipeEndpoint::kTypeLocal)
+          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));
+  scoped_refptr<ChannelEndpoint> channel_endpoint(new ChannelEndpoint(
+      this,
+      port,
+      static_cast<LocalMessagePipeEndpoint*>(old_endpoint.get())
+          ->message_queue()));
   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);
 }
 
@@ skipping 87 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