Index: mojo/edk/embedder/multiprocess_embedder_unittest.cc |
diff --git a/mojo/edk/embedder/multiprocess_embedder_unittest.cc b/mojo/edk/embedder/multiprocess_embedder_unittest.cc |
index ae26a424a27c14c47da9565d3693764710b3ecf5..2eb7f70b5a06283623a36e0f24db5515e084b2b7 100644 |
--- a/mojo/edk/embedder/multiprocess_embedder_unittest.cc |
+++ b/mojo/edk/embedder/multiprocess_embedder_unittest.cc |
@@ -9,8 +9,8 @@ |
#include <memory> |
#include "base/logging.h" |
-#include "mojo/edk/embedder/platform_channel_pair.h" |
#include "mojo/edk/embedder/test_embedder.h" |
+#include "mojo/edk/platform/platform_pipe.h" |
#include "mojo/edk/system/test/test_command_line.h" |
#include "mojo/edk/system/test/test_io_thread.h" |
#include "mojo/edk/system/test/timeouts.h" |
@@ -27,6 +27,7 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
using mojo::platform::PlatformHandleWatcher; |
+using mojo::platform::PlatformPipe; |
using mojo::platform::ScopedPlatformHandle; |
using mojo::platform::TaskRunner; |
using mojo::system::test::TestIOThread; |
@@ -147,7 +148,7 @@ TEST_F(MultiprocessEmbedderTest, ChannelsBasic) { |
mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner().Clone(), |
test_io_watcher()); |
- PlatformChannelPair channel_pair; |
+ PlatformPipe channel_pair; |
ScopedTestChannel server_channel(channel_pair.handle0.Pass()); |
MojoHandle server_mp = server_channel.bootstrap_message_pipe(); |
EXPECT_NE(server_mp, MOJO_HANDLE_INVALID); |
@@ -193,7 +194,7 @@ TEST_F(MultiprocessEmbedderTest, ChannelsHandlePassing) { |
mojo::test::ScopedIPCSupport ipc_support(test_io_task_runner().Clone(), |
test_io_watcher()); |
- PlatformChannelPair channel_pair; |
+ PlatformPipe channel_pair; |
ScopedTestChannel server_channel(channel_pair.handle0.Pass()); |
MojoHandle server_mp = server_channel.bootstrap_message_pipe(); |
EXPECT_NE(server_mp, MOJO_HANDLE_INVALID); |
@@ -368,7 +369,7 @@ TEST_F(MultiprocessEmbedderTest, ChannelShutdownRace_MessagePipeClose) { |
test_io_watcher()); |
for (size_t i = 0; i < kIterations; i++) { |
- PlatformChannelPair channel_pair; |
+ PlatformPipe channel_pair; |
std::unique_ptr<ScopedTestChannel> server_channel( |
new ScopedTestChannel(channel_pair.handle0.Pass())); |
server_channel->WaitForChannelCreationCompletion(); |