Move PlatformChannelPair to //mojo/edk/platform and rename it PlatformPipe.

mojo/edk/system/channel_manager_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 "mojo/edk/system/channel_manager.h"
 
 #include <functional>
 #include <memory>
 #include <utility>
 
-#include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/platform/message_loop.h"
+#include "mojo/edk/platform/platform_pipe.h"
 #include "mojo/edk/platform/task_runner.h"
 #include "mojo/edk/platform/test_message_loops.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/test/simple_test_thread.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::platform::MessageLoop;
 using mojo::platform::PlatformHandleWatcher;
+using mojo::platform::PlatformPipe;
 using mojo::platform::TaskRunner;
 using mojo::platform::test::CreateTestMessageLoop;
 using mojo::platform::test::CreateTestMessageLoopForIO;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 namespace {
 
 class ChannelManagerTest : public testing::Test {
@@ skipping 22 matching lines @@
   PlatformHandleWatcher* platform_handle_watcher_;
   std::unique_ptr<MessageLoop> message_loop_;
   // Note: This should be *after* the above, since they must be initialized
   // before it (and should outlive it).
   ChannelManager channel_manager_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelManagerTest);
 };
 
 TEST_F(ChannelManagerTest, Basic) {
-  embedder::PlatformChannelPair channel_pair;
+  PlatformPipe channel_pair;
 
   const ChannelId id = 1;
   RefPtr<MessagePipeDispatcher> d = channel_manager().CreateChannelOnIOThread(
       id, channel_pair.handle0.Pass());
 
   RefPtr<Channel> ch = channel_manager().GetChannel(id);
   EXPECT_TRUE(ch);
   // |ChannelManager| should have a ref.
   EXPECT_FALSE(ch->HasOneRef());
 
   channel_manager().WillShutdownChannel(id);
   // |ChannelManager| should still have a ref.
   EXPECT_FALSE(ch->HasOneRef());
 
   channel_manager().ShutdownChannelOnIOThread(id);
   // |ChannelManager| should have given up its ref.
   EXPECT_TRUE(ch->HasOneRef());
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 }
 
 TEST_F(ChannelManagerTest, TwoChannels) {
-  embedder::PlatformChannelPair channel_pair;
+  PlatformPipe channel_pair;
 
   const ChannelId id1 = 1;
   RefPtr<MessagePipeDispatcher> d1 = channel_manager().CreateChannelOnIOThread(
       id1, channel_pair.handle0.Pass());
 
   const ChannelId id2 = 2;
   RefPtr<MessagePipeDispatcher> d2 = channel_manager().CreateChannelOnIOThread(
       id2, channel_pair.handle1.Pass());
 
   RefPtr<Channel> ch1 = channel_manager().GetChannel(id1);
@@ skipping 58 matching lines @@
 
   const RefPtr<TaskRunner> task_runner_;
   ChannelManager* const channel_manager_;
   const ChannelId channel_id_;
   std::function<void()> quit_closure_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(OtherThread);
 };
 
 TEST_F(ChannelManagerTest, CallsFromOtherThread) {
-  embedder::PlatformChannelPair channel_pair;
+  PlatformPipe channel_pair;
 
   const ChannelId id = 1;
   RefPtr<MessagePipeDispatcher> d = channel_manager().CreateChannelOnIOThread(
       id, channel_pair.handle0.Pass());
 
   OtherThread thread(task_runner().Clone(), &channel_manager(), id,
                      [this]() { message_loop()->QuitNow(); });
   thread.Start();
   message_loop()->Run();
   thread.Join();
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 }
 
 // TODO(vtl): Test |CreateChannelWithoutBootstrapOnIOThread()|. (This will
 // require additional functionality in |Channel|.)
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo