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

remoting/protocol/protobuf_video_writer.cc

Index: remoting/protocol/protobuf_video_writer.cc
diff --git a/remoting/protocol/protobuf_video_writer.cc b/remoting/protocol/protobuf_video_writer.cc
index 12dd6611ad50a3d359163967aba8be8947dedb87..a3270f74544612a3d8c5ae4ce3a0d018b5ac4064 100644
--- a/remoting/protocol/protobuf_video_writer.cc
+++ b/remoting/protocol/protobuf_video_writer.cc
@@ -8,6 +8,7 @@
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
+#include "remoting/protocol/channel_factory.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/util.h"
 
@@ -15,7 +16,7 @@ namespace remoting {
 namespace protocol {
 
 ProtobufVideoWriter::ProtobufVideoWriter()
-    : session_(NULL) {
+    : channel_factory_(NULL) {
 }
 
 ProtobufVideoWriter::~ProtobufVideoWriter() {
@@ -24,10 +25,10 @@ ProtobufVideoWriter::~ProtobufVideoWriter() {
 
 void ProtobufVideoWriter::Init(protocol::Session* session,
                                const InitializedCallback& callback) {
-  session_ = session;
+  channel_factory_ = session->GetMainChannelFactory();
   initialized_callback_ = callback;
 
-  session_->CreateStreamChannel(
+  channel_factory_->CreateStreamChannel(
       kVideoChannelName,
       base::Bind(&ProtobufVideoWriter::OnChannelReady, base::Unretained(this)));
 }
@@ -50,9 +51,9 @@ void ProtobufVideoWriter::OnChannelReady(scoped_ptr<net::StreamSocket> socket) {
 void ProtobufVideoWriter::Close() {
   buffered_writer_.Close();
   channel_.reset();
-  if (session_) {
-    session_->CancelChannelCreation(kVideoChannelName);
-    session_ = NULL;
+  if (channel_factory_) {
+    channel_factory_->CancelChannelCreation(kVideoChannelName);
+    channel_factory_ = NULL;
   }
 }