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

Unified Diff: remoting/protocol/channel_multiplexer_unittest.cc

Issue 550383002: Cleanup ChannelFactory interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « remoting/protocol/channel_multiplexer.cc ('k') | remoting/protocol/fake_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_multiplexer_unittest.cc
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc
index 32be47b6251f148d281b4d316b2da7b08dc754e7..8132d32d990893103295b6e84425f18de807061c 100644
--- a/remoting/protocol/channel_multiplexer_unittest.cc
+++ b/remoting/protocol/channel_multiplexer_unittest.cc
@@ -94,10 +94,10 @@ class ChannelMultiplexerTest : public testing::Test {
scoped_ptr<net::StreamSocket>* host_socket,
scoped_ptr<net::StreamSocket>* client_socket) {
int counter = 2;
- host_mux_->CreateStreamChannel(name, base::Bind(
+ host_mux_->CreateChannel(name, base::Bind(
&ChannelMultiplexerTest::OnChannelConnected, base::Unretained(this),
host_socket, &counter));
- client_mux_->CreateStreamChannel(name, base::Bind(
+ client_mux_->CreateChannel(name, base::Bind(
&ChannelMultiplexerTest::OnChannelConnected, base::Unretained(this),
client_socket, &counter));
@@ -355,9 +355,9 @@ TEST_F(ChannelMultiplexerTest, SessionFail) {
MockConnectCallback cb1;
MockConnectCallback cb2;
- host_mux_->CreateStreamChannel(kTestChannelName, base::Bind(
+ host_mux_->CreateChannel(kTestChannelName, base::Bind(
&MockConnectCallback::OnConnected, base::Unretained(&cb1)));
- host_mux_->CreateStreamChannel(kTestChannelName2, base::Bind(
+ host_mux_->CreateChannel(kTestChannelName2, base::Bind(
&MockConnectCallback::OnConnected, base::Unretained(&cb2)));
EXPECT_CALL(cb1, OnConnectedPtr(NULL))
« no previous file with comments | « remoting/protocol/channel_multiplexer.cc ('k') | remoting/protocol/fake_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698