Add support for multiplexed channels in remoting::protocol::Session interface.

remoting/protocol/jingle_session_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/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/test/test_timeouts.h"
@@ skipping 210 matching lines @@
 
     client_session_ = client_server_->Connect(
         kHostJid, authenticator.Pass(),
         CandidateSessionConfig::CreateDefault());
     client_session_->SetEventHandler(&client_session_event_handler_);
 
     message_loop_->RunAllPending();
   }
 
   void CreateChannel() {
-    client_session_->CreateStreamChannel(kChannelName, base::Bind(
-        &JingleSessionTest::OnClientChannelCreated, base::Unretained(this)));
-    host_session_->CreateStreamChannel(kChannelName, base::Bind(
-        &JingleSessionTest::OnHostChannelCreated, base::Unretained(this)));
+    client_session_->GetTransportChannelFactory()->CreateStreamChannel(
+        kChannelName, base::Bind(&JingleSessionTest::OnClientChannelCreated,
+                                 base::Unretained(this)));
+    host_session_->GetTransportChannelFactory()->CreateStreamChannel(
+        kChannelName, base::Bind(&JingleSessionTest::OnHostChannelCreated,
+                                 base::Unretained(this)));
 
     int counter = 2;
-    ExpectRouteChange();
+    ExpectRouteChange(kChannelName);
     EXPECT_CALL(client_channel_callback_, OnDone(_))
         .WillOnce(QuitThreadOnCounter(&counter));
     EXPECT_CALL(host_channel_callback_, OnDone(_))
         .WillOnce(QuitThreadOnCounter(&counter));
     message_loop_->Run();
 
     EXPECT_TRUE(client_socket_.get());
     EXPECT_TRUE(host_socket_.get());
   }
 
-  void ExpectRouteChange() {
+  void ExpectRouteChange(const std::string& channel_name) {
     EXPECT_CALL(host_session_event_handler_,
-                OnSessionRouteChange(kChannelName, _))
+                OnSessionRouteChange(channel_name, _))
         .Times(AtLeast(1));
     EXPECT_CALL(client_session_event_handler_,
-                OnSessionRouteChange(kChannelName, _))
+                OnSessionRouteChange(channel_name, _))
         .Times(AtLeast(1));
   }
 
   scoped_ptr<MessageLoopForIO> message_loop_;
 
   scoped_ptr<FakeSignalStrategy> host_signal_strategy_;
   scoped_ptr<FakeSignalStrategy> client_signal_strategy_;
 
   scoped_ptr<JingleSessionManager> host_server_;
   MockSessionManagerListener host_server_listener_;
@@ skipping 86 matching lines @@
 
   ASSERT_NO_FATAL_FAILURE(CreateChannel());
 
   StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
                                 kMessageSize, kMessages);
   tester.Start();
   message_loop_->Run();
   tester.CheckResults();
 }
 
+// Verify that data can be sent over a multiplexed channel.
+TEST_F(JingleSessionTest, TestMuxStreamChannel) {
+  CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
+  ASSERT_NO_FATAL_FAILURE(
+      InitiateConnection(1, FakeAuthenticator::ACCEPT, false));
+
+  client_session_->GetMultiplexedChannelFactory()->CreateStreamChannel(
+      kChannelName, base::Bind(&JingleSessionTest::OnClientChannelCreated,
+                               base::Unretained(this)));
+  host_session_->GetMultiplexedChannelFactory()->CreateStreamChannel(
+      kChannelName, base::Bind(&JingleSessionTest::OnHostChannelCreated,
+                               base::Unretained(this)));
+
+  int counter = 2;
+  ExpectRouteChange("mux");
+  EXPECT_CALL(client_channel_callback_, OnDone(_))
+      .WillOnce(QuitThreadOnCounter(&counter));
+  EXPECT_CALL(host_channel_callback_, OnDone(_))
+      .WillOnce(QuitThreadOnCounter(&counter));
+  message_loop_->Run();
+
+  EXPECT_TRUE(client_socket_.get());
+  EXPECT_TRUE(host_socket_.get());
+
+  StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
+                                kMessageSize, kMessages);
+  tester.Start();
+  message_loop_->Run();
+  tester.CheckResults();
+}
+
 // Verify that we can connect channels with multistep auth.
 TEST_F(JingleSessionTest, TestMultistepAuthStreamChannel) {
   CreateSessionManagers(3, FakeAuthenticator::ACCEPT);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(3, FakeAuthenticator::ACCEPT, false));
 
   ASSERT_NO_FATAL_FAILURE(CreateChannel());
 
   StreamConnectionTester tester(host_socket_.get(), client_socket_.get(),
                                 kMessageSize, kMessages);
   tester.Start();
   message_loop_->Run();
   tester.CheckResults();
 }
 
 // Verify that we shutdown properly when channel authentication fails.
 TEST_F(JingleSessionTest, TestFailedChannelAuth) {
   CreateSessionManagers(1, FakeAuthenticator::REJECT_CHANNEL);
   ASSERT_NO_FATAL_FAILURE(
       InitiateConnection(1, FakeAuthenticator::ACCEPT, false));
 
-  client_session_->CreateStreamChannel(kChannelName, base::Bind(
-      &JingleSessionTest::OnClientChannelCreated, base::Unretained(this)));
-  host_session_->CreateStreamChannel(kChannelName, base::Bind(
-      &JingleSessionTest::OnHostChannelCreated, base::Unretained(this)));
+  client_session_->GetTransportChannelFactory()->CreateStreamChannel(
+      kChannelName, base::Bind(&JingleSessionTest::OnClientChannelCreated,
+                               base::Unretained(this)));
+  host_session_->GetTransportChannelFactory()->CreateStreamChannel(
+      kChannelName, base::Bind(&JingleSessionTest::OnHostChannelCreated,
+                               base::Unretained(this)));
 
   // Terminate the message loop when we get rejection notification
   // from the host.
   EXPECT_CALL(host_channel_callback_, OnDone(NULL))
       .WillOnce(QuitThread());
   EXPECT_CALL(client_channel_callback_, OnDone(_))
       .Times(AtMost(1));
-  ExpectRouteChange();
+  ExpectRouteChange(kChannelName);
 
   message_loop_->Run();
 
   EXPECT_TRUE(!host_socket_.get());
 }
 
 }  // namespace protocol
 }  // namespace remoting