Remove video_channel() from 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 8e8ce42e911c38db2725ea8573ccbfe4ccf62fa5..165a3a82e8f199e68117557c629683afd9991f46 100644
--- a/remoting/protocol/protobuf_video_reader.h
+++ b/remoting/protocol/protobuf_video_reader.h
@@ -1,14 +1,19 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #ifndef REMOTING_PROTOCOL_PROTOBUF_VIDEO_READER_H_
 #define REMOTING_PROTOCOL_PROTOBUF_VIDEO_READER_H_
 
+#include "base/compiler_specific.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/video_reader.h"
 
+namespace net {
+class StreamSocket;
+}  // namespace net
+
 namespace remoting {
 namespace protocol {
 
@@ -20,13 +25,21 @@ class ProtobufVideoReader : public VideoReader {
   virtual ~ProtobufVideoReader();
 
   // VideoReader interface.
-  virtual void Init(protocol::Session* session, VideoStub* video_stub);
+  virtual void Init(protocol::Session* session,
+                    VideoStub* video_stub,
+                    const InitializedCallback& callback) OVERRIDE;
 
  private:
+  void OnChannelReady(const std::string& name, net::StreamSocket* socket);
   void OnNewData(VideoPacket* packet, Task* done_task);
 
+  InitializedCallback initialized_callback_;
+
   VideoPacketFormat::Encoding encoding_;
 
+  // TODO(sergeyu): Remove |channel_| and let |reader_| own it.
+  scoped_ptr<net::StreamSocket> channel_;
+
   ProtobufMessageReader<VideoPacket> reader_;
 
   // The stub that processes all received packets.