Enable channel multiplexing for control, event and audio channels.

BUG=137135

Review URL: https://chromiumcodereview.appspot.com/10825359

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152703 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 1 deletions

diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc
index 7eb88e0..555333d 100644
--- a/remoting/protocol/channel_dispatcher_base.cc
+++ b/remoting/protocol/channel_dispatcher_base.cc
@@ -8,6 +8,7 @@
 #include "net/socket/stream_socket.h"
 #include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/session.h"
+#include "remoting/protocol/session_config.h"
 
 namespace remoting {
 namespace protocol {
@@ -23,9 +24,24 @@ ChannelDispatcherBase::~ChannelDispatcherBase() {
 }
 
 void ChannelDispatcherBase::Init(Session* session,
+                                 const ChannelConfig& config,
                                  const InitializedCallback& callback) {
   DCHECK(session);
-  channel_factory_ = session->GetTransportChannelFactory();
+  switch (config.transport) {
+    case ChannelConfig::TRANSPORT_MUX_STREAM:
+      channel_factory_ = session->GetMultiplexedChannelFactory();
+      break;
+
+    case ChannelConfig::TRANSPORT_STREAM:
+      channel_factory_ = session->GetTransportChannelFactory();
+      break;
+
+    default:
+      NOTREACHED();
+      callback.Run(false);
+      return;
+  }
+
   initialized_callback_ = callback;
 
   channel_factory_->CreateStreamChannel(channel_name_, base::Bind(