Remove video_channel() from Session interface

remoting/protocol/protobuf_video_reader.cc

 // 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.
 
 #include "remoting/protocol/protobuf_video_reader.h"
 
+#include "base/bind.h"
 #include "base/task.h"
+#include "net/socket/stream_socket.h"
+#include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/session.h"
 
 namespace remoting {
 namespace protocol {
 
 ProtobufVideoReader::ProtobufVideoReader(VideoPacketFormat::Encoding encoding)
     : encoding_(encoding),
       video_stub_(NULL) {
 }
 
 ProtobufVideoReader::~ProtobufVideoReader() { }
 
 void ProtobufVideoReader::Init(protocol::Session* session,
-                               VideoStub* video_stub) {
-  reader_.Init(
-      session->video_channel(),
-      NewCallback(this, &ProtobufVideoReader::OnNewData));
+                               VideoStub* video_stub,
+                               const InitializedCallback& callback) {
+  initialized_callback_ = callback;
   video_stub_ = video_stub;
+
+  session->CreateStreamChannel(
+      kVideoChannelName,
+      base::Bind(&ProtobufVideoReader::OnChannelReady, base::Unretained(this)));
+}
+
+void ProtobufVideoReader::OnChannelReady(const std::string& name,
+                                         net::StreamSocket* socket) {
+  DCHECK_EQ(name, std::string(kVideoChannelName));
+  if (!socket) {
+    initialized_callback_.Run(false);
+    return;
+  }
+
+  DCHECK(!channel_.get());
+  channel_.reset(socket);
+  reader_.Init(socket, NewCallback(this, &ProtobufVideoReader::OnNewData));
+  initialized_callback_.Run(true);
 }
 
 void ProtobufVideoReader::OnNewData(VideoPacket* packet, Task* done_task) {
   video_stub_->ProcessVideoPacket(packet, done_task);
 }
 
 }  // namespace protocol
 }  // namespace remoting