Cleanup ChannelFactory interface

remoting/protocol/channel_multiplexer_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/channel_multiplexer.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "net/base/net_errors.h"
@@ skipping 76 matching lines @@
     host_socket->PairWith(client_socket);
 
     // Make writes asynchronous in one direction.
     host_socket->set_async_write(true);
   }
 
   void CreateChannel(const std::string& name,
                      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));
 
     message_loop_.Run();
 
     EXPECT_TRUE(host_socket->get());
     EXPECT_TRUE(client_socket->get());
   }
 
   void OnChannelConnected(
@@ skipping 237 matching lines @@
   EXPECT_FALSE(host_mux_.get());
 }
 
 TEST_F(ChannelMultiplexerTest, SessionFail) {
   host_session_.set_async_creation(true);
   host_session_.set_error(AUTHENTICATION_FAILED);
 
   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))
       .Times(AtMost(1))
       .WillOnce(InvokeWithoutArgs(
           this, &ChannelMultiplexerTest::DeleteAfterSessionFail));
   EXPECT_CALL(cb2, OnConnectedPtr(_))
       .Times(0);
 
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace protocol
 }  // namespace remoting