Mojo: Remove Channel::AttachMessagePipeEndpoint().

mojo/system/message_pipe_dispatcher.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_dispatcher.h"
 
 #include "base/logging.h"
 #include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
 #include "mojo/system/constants.h"
 #include "mojo/system/local_message_pipe_endpoint.h"
 #include "mojo/system/memory.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/options_validation.h"
 #include "mojo/system/proxy_message_pipe_endpoint.h"
 
 namespace mojo {
 namespace system {
@@ skipping 90 matching lines @@
       static_cast<const SerializedMessagePipeDispatcher*>(source)->endpoint_id;
   if (remote_id == MessageInTransit::kInvalidEndpointId) {
     // This means that the other end was closed, and there were no messages
     // enqueued for us.
     // TODO(vtl): This is wrong. We should produce a "dead" message pipe
     // dispatcher.
     NOTIMPLEMENTED();
     return scoped_refptr<MessagePipeDispatcher>();
   }
   MessageInTransit::EndpointId local_id =
-      channel->AttachMessagePipeEndpoint(remote_message_pipe.second, 1);
+      channel->AttachEndpoint(make_scoped_refptr(
+          new ChannelEndpoint(remote_message_pipe.second.get(), 1)));
   if (local_id == MessageInTransit::kInvalidEndpointId) {
     LOG(ERROR) << "Failed to deserialize message pipe dispatcher (failed to "
                   "attach; remote ID = " << remote_id << ")";
     return scoped_refptr<MessagePipeDispatcher>();
   }
   DVLOG(2) << "Deserializing message pipe dispatcher (remote ID = " << remote_id
            << ", new local ID = " << local_id << ")";
 
   if (!channel->RunMessagePipeEndpoint(local_id, remote_id)) {
     // In general, this shouldn't fail, since we generated |local_id| locally.
@@ skipping 112 matching lines @@
     Channel* channel,
     void* destination,
     size_t* actual_size,
     embedder::PlatformHandleVector* /*platform_handles*/) {
   DCHECK(HasOneRef());  // Only one ref => no need to take the lock.
 
   // Convert the local endpoint to a proxy endpoint (moving the message queue).
   message_pipe_->ConvertLocalToProxy(port_);
 
   // Attach the new proxy endpoint to the channel.
-  MessageInTransit::EndpointId endpoint_id =
-      channel->AttachMessagePipeEndpoint(message_pipe_, port_);
+  MessageInTransit::EndpointId endpoint_id = channel->AttachEndpoint(
+      make_scoped_refptr(new ChannelEndpoint(message_pipe_.get(), port_)));
   // Note: It's okay to get an endpoint ID of |kInvalidEndpointId|. (It's
   // possible that the other endpoint -- the one that we're not sending -- was
   // closed in the intervening time.) In that case, we need to deserialize a
   // "dead" message pipe dispatcher on the other end. (Note that this is
   // different from just producing |MOJO_HANDLE_INVALID|.)
   DVLOG(2) << "Serializing message pipe dispatcher (local ID = " << endpoint_id
            << ")";
 
   // We now have a local ID. Before we can run the proxy endpoint, we need to
   // get an ack back from the other side with the remote ID.
@@ skipping 10 matching lines @@
 // MessagePipeDispatcherTransport ----------------------------------------------
 
 MessagePipeDispatcherTransport::MessagePipeDispatcherTransport(
     DispatcherTransport transport)
     : DispatcherTransport(transport) {
   DCHECK_EQ(message_pipe_dispatcher()->GetType(), Dispatcher::kTypeMessagePipe);
 }
 
 }  // namespace system
 }  // namespace mojo