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

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

Issue 1665573002: Rename some variables platform_channel_pair -> platform_pipe. (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 | « no previous file | mojo/edk/system/master_connection_manager.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 7f6a7939ea5b8800b7e377cd16660202c33ffb23..a5d19df198bc941e7de7720ea076b19293f515a2 100644
--- a/mojo/edk/system/connection_manager_unittest.cc
+++ b/mojo/edk/system/connection_manager_unittest.cc
@@ -198,11 +198,11 @@ class ConnectionManagerTest : public testing::Test {
embedder::SlaveProcessDelegate* slave_process_delegate,
SlaveConnectionManager* slave,
const std::string& slave_name) {
- PlatformPipe platform_channel_pair;
+ PlatformPipe platform_pipe;
ProcessIdentifier slave_process_identifier = master->AddSlave(
- new TestSlaveInfo(slave_name), platform_channel_pair.handle0.Pass());
+ new TestSlaveInfo(slave_name), platform_pipe.handle0.Pass());
slave->Init(task_runner().Clone(), slave_process_delegate,
- platform_channel_pair.handle1.Pass());
+ platform_pipe.handle1.Pass());
return slave_process_identifier;
}
@@ -650,9 +650,9 @@ TEST_F(ConnectionManagerTest, AddSlaveThenImmediateShutdown) {
MockSlaveProcessDelegate slave_process_delegate;
SlaveConnectionManager slave(platform_support());
- PlatformPipe platform_channel_pair;
- ProcessIdentifier slave_id = master.AddSlave(
- new TestSlaveInfo("slave"), platform_channel_pair.handle0.Pass());
+ PlatformPipe platform_pipe;
+ ProcessIdentifier slave_id =
+ master.AddSlave(new TestSlaveInfo("slave"), platform_pipe.handle0.Pass());
master.Shutdown();
EXPECT_TRUE(IsValidSlaveProcessIdentifier(slave_id));
// Since we never initialized |slave|, we don't have to shut it down.
@@ -662,11 +662,10 @@ TEST_F(ConnectionManagerTest, AddSlaveAndBootstrap) {
MasterConnectionManager master(platform_support());
master.Init(task_runner().Clone(), &master_process_delegate());
- PlatformPipe platform_channel_pair;
+ PlatformPipe platform_pipe;
ConnectionIdentifier connection_id = master.GenerateConnectionIdentifier();
ProcessIdentifier slave_id = master.AddSlaveAndBootstrap(
- new TestSlaveInfo("slave"), platform_channel_pair.handle0.Pass(),
- connection_id);
+ new TestSlaveInfo("slave"), platform_pipe.handle0.Pass(), connection_id);
EXPECT_TRUE(IsValidSlaveProcessIdentifier(slave_id));
ScopedPlatformHandle h1;
@@ -682,7 +681,7 @@ TEST_F(ConnectionManagerTest, AddSlaveAndBootstrap) {
MockSlaveProcessDelegate slave_process_delegate;
SlaveConnectionManager slave(platform_support());
slave.Init(task_runner().Clone(), &slave_process_delegate,
- platform_channel_pair.handle1.Pass());
+ platform_pipe.handle1.Pass());
ProcessIdentifier slave_peer = kInvalidProcessIdentifier;
ScopedPlatformHandle h2;
« no previous file with comments | « no previous file | mojo/edk/system/master_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698