Mojo: Remove Channel::AttachMessagePipeEndpoint().

mojo/embedder/embedder.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/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/embedder/platform_support.h"
 #include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.h"
 #include "mojo/system/core.h"
 #include "mojo/system/entrypoints.h"
 #include "mojo/system/message_in_transit.h"
 #include "mojo/system/message_pipe.h"
 #include "mojo/system/message_pipe_dispatcher.h"
 #include "mojo/system/platform_handle_dispatcher.h"
 #include "mojo/system/raw_channel.h"
 
 namespace mojo {
 namespace embedder {
@@ skipping 28 matching lines @@
     // This is very unusual (e.g., maybe |platform_handle| was invalid or we
     // reached some system resource limit).
     LOG(ERROR) << "Channel::Init() failed";
     // Return null, since |Shutdown()| shouldn't be called in this case.
     return scoped_refptr<system::Channel>();
   }
   // Once |Init()| has succeeded, we have to return |channel| (since
   // |Shutdown()| will have to be called on it).
 
   // Attach the message pipe endpoint.
-  system::MessageInTransit::EndpointId endpoint_id =
-      channel->AttachMessagePipeEndpoint(message_pipe, 1);
+  system::MessageInTransit::EndpointId endpoint_id = channel->AttachEndpoint(
+      make_scoped_refptr(new system::ChannelEndpoint(message_pipe.get(), 1)));
   if (endpoint_id == system::MessageInTransit::kInvalidEndpointId) {
     // This means that, e.g., the other endpoint of the message pipe was closed
     // first. But it's not necessarily an error per se.
-    DVLOG(2) << "Channel::AttachMessagePipeEndpoint() failed";
+    DVLOG(2) << "Channel::AttachEndpoint() failed";
     return channel;
   }
   CHECK_EQ(endpoint_id, system::Channel::kBootstrapEndpointId);
 
   if (!channel->RunMessagePipeEndpoint(system::Channel::kBootstrapEndpointId,
                                        system::Channel::kBootstrapEndpointId)) {
     // Currently, there's no reason for this to fail.
     NOTREACHED() << "Channel::RunMessagePipeEndpoint() failed";
     return channel;
   }
@@ skipping 154 matching lines @@
 
   *platform_handle =
       static_cast<system::PlatformHandleDispatcher*>(dispatcher.get())
           ->PassPlatformHandle()
           .Pass();
   return MOJO_RESULT_OK;
 }
 
 }  // namespace embedder
 }  // namespace mojo