Mojo: Remove Channel::AttachMessagePipeEndpoint().

mojo/system/remote_message_pipe_unittest.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 <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_io_thread.h"
 #include "base/threading/platform_thread.h"  // For |Sleep()|.
 #include "build/build_config.h"              // TODO(vtl): Remove this.
 #include "mojo/common/test/test_utils.h"
 #include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/embedder/platform_shared_buffer.h"
 #include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/embedder/simple_platform_support.h"
 #include "mojo/system/channel.h"
+#include "mojo/system/channel_endpoint.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"
 #include "mojo/system/shared_buffer_dispatcher.h"
 #include "mojo/system/test_utils.h"
 #include "mojo/system/waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ skipping 91 matching lines @@
 
   void ConnectMessagePipesOnIOThread(scoped_refptr<MessagePipe> mp0,
                                      scoped_refptr<MessagePipe> mp1) {
     CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
 
     if (!channels_[0].get())
       CreateAndInitChannel(0);
     if (!channels_[1].get())
       CreateAndInitChannel(1);
 
-    MessageInTransit::EndpointId local_id0 =
-        channels_[0]->AttachMessagePipeEndpoint(mp0, 1);
-    MessageInTransit::EndpointId local_id1 =
-        channels_[1]->AttachMessagePipeEndpoint(mp1, 0);
+    MessageInTransit::EndpointId local_id0 = channels_[0]->AttachEndpoint(
+        make_scoped_refptr(new ChannelEndpoint(mp0.get(), 1)));
+    MessageInTransit::EndpointId local_id1 = channels_[1]->AttachEndpoint(
+        make_scoped_refptr(new ChannelEndpoint(mp1.get(), 0)));
 
     CHECK(channels_[0]->RunMessagePipeEndpoint(local_id0, local_id1));
     CHECK(channels_[1]->RunMessagePipeEndpoint(local_id1, local_id0));
   }
 
   void BootstrapMessagePipeOnIOThread(unsigned channel_index,
                                       scoped_refptr<MessagePipe> mp) {
     CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
     CHECK(channel_index == 0 || channel_index == 1);
 
     unsigned port = channel_index ^ 1u;
 
     CreateAndInitChannel(channel_index);
     MessageInTransit::EndpointId endpoint_id =
-        channels_[channel_index]->AttachMessagePipeEndpoint(mp, port);
+        channels_[channel_index]->AttachEndpoint(
+            make_scoped_refptr(new ChannelEndpoint(mp.get(), port)));
     if (endpoint_id == MessageInTransit::kInvalidEndpointId)
       return;
 
     CHECK_EQ(endpoint_id, Channel::kBootstrapEndpointId);
     CHECK(channels_[channel_index]->RunMessagePipeEndpoint(
         Channel::kBootstrapEndpointId, Channel::kBootstrapEndpointId));
   }
 
   void RestoreInitialStateOnIOThread() {
     CHECK_EQ(base::MessageLoop::current(), io_thread()->message_loop());
@@ skipping 991 matching lines @@
   mp0->Close(0);
   mp1->Close(1);
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
   // Note that |local_mp|'s port 0 belong to |dispatcher|, which was closed.
   local_mp->Close(1);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo