Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b

mojo/edk/system/channel_endpoint.cc

 // Copyright 2014 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/channel_endpoint.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/message_pipe.h"
 #include "mojo/edk/system/transport_data.h"
 
 namespace mojo {
 namespace system {
 
-ChannelEndpoint::ChannelEndpoint(MessagePipe* message_pipe, unsigned port)
+ChannelEndpoint::ChannelEndpoint(MessagePipe* message_pipe,
+                                 unsigned port,
+                                 MessageInTransitQueue* message_queue)
     : message_pipe_(message_pipe), port_(port), channel_(nullptr) {
-  DCHECK(message_pipe_.get());
+  DCHECK(message_pipe_.get() || message_queue);
   DCHECK(port_ == 0 || port_ == 1);
-}
 
-void ChannelEndpoint::TakeMessages(MessageInTransitQueue* message_queue) {
-  DCHECK(paused_message_queue_.IsEmpty());
-  paused_message_queue_.Swap(message_queue);
+  if (message_queue)
+    paused_message_queue_.Swap(message_queue);
 }
 
 bool ChannelEndpoint::EnqueueMessage(scoped_ptr<MessageInTransit> message) {
   DCHECK(message);
 
   base::AutoLock locker(lock_);
 
   if (!channel_ || !remote_id_.is_valid()) {
     // We may reach here if we haven't been attached or run yet.
     // TODO(vtl): We may also reach here if the channel is shut down early for
     // some reason (with live message pipes on it). We can't check |state_| yet,
     // until it's protected under lock, but in this case we should return false
     // (and not enqueue any messages).
     paused_message_queue_.AddMessage(message.Pass());
     return true;
   }
 
   // TODO(vtl): Currently, this only works in the "running" case.
   DCHECK(remote_id_.is_valid());
 
   return WriteMessageNoLock(message.Pass());
 }
 
 void ChannelEndpoint::DetachFromMessagePipe() {
-  // TODO(vtl): Once |message_pipe_| is under |lock_|, we should null it out
-  // here. For now, get the channel to do so for us.
-
   {
     base::AutoLock locker(lock_);
     DCHECK(message_pipe_.get());
     message_pipe_ = nullptr;
 
     if (!channel_)
       return;
     DCHECK(local_id_.is_valid());
     // TODO(vtl): Once we combine "run" into "attach", |remote_id_| should valid
     // here as well.
@@ skipping 16 matching lines @@
   DCHECK(!local_id_.is_valid());
   DCHECK(!remote_id_.is_valid());
   channel_ = channel;
   local_id_ = local_id;
   remote_id_ = remote_id;
 
   while (!paused_message_queue_.IsEmpty()) {
     LOG_IF(WARNING, !WriteMessageNoLock(paused_message_queue_.GetMessage()))
         << "Failed to write enqueue message to channel";
   }
+
+  if (!message_pipe_.get()) {
+    channel_->DetachEndpoint(this, local_id_, remote_id_);
+    channel_ = nullptr;
+    local_id_ = ChannelEndpointId();
+    remote_id_ = ChannelEndpointId();
+  }
 }
 
 bool ChannelEndpoint::OnReadMessage(
     const MessageInTransit::View& message_view,
     embedder::ScopedPlatformHandleVectorPtr platform_handles) {
   scoped_ptr<MessageInTransit> message(new MessageInTransit(message_view));
   scoped_refptr<MessagePipe> message_pipe;
   unsigned port;
   {
     base::AutoLock locker(lock_);
@@ skipping 71 matching lines @@
   DCHECK(remote_id_.is_valid());
 
   message->SerializeAndCloseDispatchers(channel_);
   message->set_source_id(local_id_);
   message->set_destination_id(remote_id_);
   return channel_->WriteMessage(message.Pass());
 }
 
 }  // namespace system
 }  // namespace mojo