Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(776)

Unified Diff: mojo/edk/system/connection_manager_unittest.cc

Issue 1659213002: Move PlatformChannelPair to //mojo/edk/platform and rename it PlatformPipe. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/system/channel_test_base.cc ('k') | mojo/edk/system/data_pipe_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/connection_manager_unittest.cc
diff --git a/mojo/edk/system/connection_manager_unittest.cc b/mojo/edk/system/connection_manager_unittest.cc
index 4f1bb3de8cb178a526359763568d0c8d862cfb6b..7f6a7939ea5b8800b7e377cd16660202c33ffb23 100644
--- a/mojo/edk/system/connection_manager_unittest.cc
+++ b/mojo/edk/system/connection_manager_unittest.cc
@@ -14,11 +14,11 @@
#include "mojo/edk/base_edk/platform_task_runner_impl.h"
#include "mojo/edk/embedder/master_process_delegate.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/simple_platform_support.h"
#include "mojo/edk/embedder/slave_process_delegate.h"
#include "mojo/edk/platform/message_loop.h"
#include "mojo/edk/platform/platform_handle.h"
+#include "mojo/edk/platform/platform_pipe.h"
#include "mojo/edk/platform/test_message_loops.h"
#include "mojo/edk/system/master_connection_manager.h"
#include "mojo/edk/system/slave_connection_manager.h"
@@ -30,6 +30,7 @@
using mojo::platform::MessageLoop;
using mojo::platform::PlatformHandle;
+using mojo::platform::PlatformPipe;
using mojo::platform::ScopedPlatformHandle;
using mojo::platform::TaskRunner;
using mojo::platform::test::CreateTestMessageLoop;
@@ -197,7 +198,7 @@ class ConnectionManagerTest : public testing::Test {
embedder::SlaveProcessDelegate* slave_process_delegate,
SlaveConnectionManager* slave,
const std::string& slave_name) {
- embedder::PlatformChannelPair platform_channel_pair;
+ PlatformPipe platform_channel_pair;
ProcessIdentifier slave_process_identifier = master->AddSlave(
new TestSlaveInfo(slave_name), platform_channel_pair.handle0.Pass());
slave->Init(task_runner().Clone(), slave_process_delegate,
@@ -649,7 +650,7 @@ TEST_F(ConnectionManagerTest, AddSlaveThenImmediateShutdown) {
MockSlaveProcessDelegate slave_process_delegate;
SlaveConnectionManager slave(platform_support());
- embedder::PlatformChannelPair platform_channel_pair;
+ PlatformPipe platform_channel_pair;
ProcessIdentifier slave_id = master.AddSlave(
new TestSlaveInfo("slave"), platform_channel_pair.handle0.Pass());
master.Shutdown();
@@ -661,7 +662,7 @@ TEST_F(ConnectionManagerTest, AddSlaveAndBootstrap) {
MasterConnectionManager master(platform_support());
master.Init(task_runner().Clone(), &master_process_delegate());
- embedder::PlatformChannelPair platform_channel_pair;
+ PlatformPipe platform_channel_pair;
ConnectionIdentifier connection_id = master.GenerateConnectionIdentifier();
ProcessIdentifier slave_id = master.AddSlaveAndBootstrap(
new TestSlaveInfo("slave"), platform_channel_pair.handle0.Pass(),
« no previous file with comments | « mojo/edk/system/channel_test_base.cc ('k') | mojo/edk/system/data_pipe_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698