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

remoting/protocol/protobuf_video_reader.h

Index: remoting/protocol/protobuf_video_reader.h
diff --git a/remoting/protocol/protobuf_video_reader.h b/remoting/protocol/protobuf_video_reader.h
index 8bf07b20f2a001b502a2ea33624e0079859b6c19..f6bb55caa85dc46aa051359b48b5107ea364a3ba 100644
--- a/remoting/protocol/protobuf_video_reader.h
+++ b/remoting/protocol/protobuf_video_reader.h
@@ -17,6 +17,7 @@ class StreamSocket;
 namespace remoting {
 namespace protocol {
 
+class ChannelFactory;
 class Session;
 
 class ProtobufVideoReader : public VideoReader {
@@ -35,13 +36,11 @@ class ProtobufVideoReader : public VideoReader {
   void OnNewData(scoped_ptr<VideoPacket> packet,
                  const base::Closure& done_task);
 
-  Session* session_;
-
   InitializedCallback initialized_callback_;
 
   VideoPacketFormat::Encoding encoding_;
 
-  // TODO(sergeyu): Remove |channel_| and let |reader_| own it.
+  ChannelFactory* channel_factory_;
   scoped_ptr<net::StreamSocket> channel_;
 
   ProtobufMessageReader<VideoPacket> reader_;