diff options
| author | sergeyu <sergeyu@chromium.org> | 2014-09-08 23:05:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 06:13:52 +0000 |
| commit | a29e1639cc388bcb603b025abe28f43cc33bfd09 (patch) | |
| tree | 04bd3bb128b67f0ab3b65ab64b6cf1662e953095 /remoting/protocol/channel_multiplexer_unittest.cc | |
| parent | 63f76caebfb34a72608f8c8e12cf5e466ba9e0cb (diff) | |
| download | chromium_src-a29e1639cc388bcb603b025abe28f43cc33bfd09.zip chromium_src-a29e1639cc388bcb603b025abe28f43cc33bfd09.tar.gz chromium_src-a29e1639cc388bcb603b025abe28f43cc33bfd09.tar.bz2 | |
Cleanup ChannelFactory interface
Removed CreateDatagramChannel() (it was never used) and renamed
CreateStreamChannel() to CreateChannel()
BUG=402993
Review URL: https://codereview.chromium.org/550383002
Cr-Commit-Position: refs/heads/master@{#293863}
Diffstat (limited to 'remoting/protocol/channel_multiplexer_unittest.cc')
| -rw-r--r-- | remoting/protocol/channel_multiplexer_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc index 32be47b..8132d32 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)) |