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

mojo/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/system/channel_endpoint.h"
 
 #include "base/logging.h"
 #include "mojo/system/channel.h"
 #include "mojo/system/message_pipe.h"
 
 namespace mojo {
 namespace system {
 
 ChannelEndpoint::ChannelEndpoint(MessagePipe* message_pipe, unsigned port)
     : state_(STATE_NORMAL),
       message_pipe_(message_pipe),
       port_(port),
       channel_(),
       local_id_(MessageInTransit::kInvalidEndpointId),
       remote_id_(MessageInTransit::kInvalidEndpointId) {
   DCHECK(message_pipe_.get());
   DCHECK(port_ == 0 || port_ == 1);
 }
 
+bool ChannelEndpoint::EnqueueMessage(scoped_ptr<MessageInTransit> message) {
+  DCHECK(message);
+
+  base::AutoLock locker(lock_);
+  if (!channel_) {
+    // Generally, this should only happen if the channel is shut down for some
+    // reason (with live message pipes on it).
+    return false;
+  }
+  DCHECK_NE(local_id_, MessageInTransit::kInvalidEndpointId);
+  // TODO(vtl): Currently, we only support enqueueing messages when we're
+  // "running".
+  DCHECK_NE(remote_id_, MessageInTransit::kInvalidEndpointId);
+
+  message->SerializeAndCloseDispatchers(channel_);
+  message->set_source_id(local_id_);
+  message->set_destination_id(remote_id_);
+  return channel_->WriteMessage(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.
+
+  scoped_refptr<Channel> channel;
+  {
+    base::AutoLock locker(lock_);
+    if (!channel_)
+      return;
+    DCHECK_NE(local_id_, MessageInTransit::kInvalidEndpointId);
+    // TODO(vtl): Once we combine "run" into "attach", |remote_id_| should valid
+    // here as well.
+    channel = channel_;
+  }
+  // Don't call this under |lock_|, since it'll call us back.
+  // TODO(vtl): This seems pretty suboptimal.
+  channel->DetachMessagePipeEndpoint(local_id_, remote_id_);
+}
+
 void ChannelEndpoint::AttachToChannel(Channel* channel,
                                       MessageInTransit::EndpointId local_id) {
   DCHECK(channel);
   DCHECK_NE(local_id, MessageInTransit::kInvalidEndpointId);
 
   base::AutoLock locker(lock_);
   DCHECK(!channel_);
   DCHECK_EQ(local_id_, MessageInTransit::kInvalidEndpointId);
   channel_ = channel;
   local_id_ = local_id;
@@ skipping 20 matching lines @@
 }
 
 ChannelEndpoint::~ChannelEndpoint() {
   DCHECK(!channel_);
   DCHECK_EQ(local_id_, MessageInTransit::kInvalidEndpointId);
   DCHECK_EQ(remote_id_, MessageInTransit::kInvalidEndpointId);
 }
 
 }  // namespace system
 }  // namespace mojo