| Index: remoting/protocol/protobuf_video_reader.cc
 | 
| diff --git a/remoting/protocol/protobuf_video_reader.cc b/remoting/protocol/protobuf_video_reader.cc
 | 
| index 827a63f49262bd74ea55e66f200f0d38dbfd0fb2..c10b28e6a18941d4b124fa246c86d3895d4c7525 100644
 | 
| --- a/remoting/protocol/protobuf_video_reader.cc
 | 
| +++ b/remoting/protocol/protobuf_video_reader.cc
 | 
| @@ -8,30 +8,31 @@
 | 
|  #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"
 | 
|  
 | 
|  namespace remoting {
 | 
|  namespace protocol {
 | 
|  
 | 
|  ProtobufVideoReader::ProtobufVideoReader(VideoPacketFormat::Encoding encoding)
 | 
| -    : session_(NULL),
 | 
| +    : channel_factory_(NULL),
 | 
|        encoding_(encoding),
 | 
|        video_stub_(NULL) {
 | 
|  }
 | 
|  
 | 
|  ProtobufVideoReader::~ProtobufVideoReader() {
 | 
| -  if (session_)
 | 
| -    session_->CancelChannelCreation(kVideoChannelName);
 | 
| +  if (channel_factory_)
 | 
| +    channel_factory_->CancelChannelCreation(kVideoChannelName);
 | 
|  }
 | 
|  
 | 
|  void ProtobufVideoReader::Init(protocol::Session* session,
 | 
|                                 VideoStub* video_stub,
 | 
|                                 const InitializedCallback& callback) {
 | 
| -  session_ = session;
 | 
| +  channel_factory_ = session->GetTransportChannelFactory();
 | 
|    initialized_callback_ = callback;
 | 
|    video_stub_ = video_stub;
 | 
|  
 | 
| -  session_->CreateStreamChannel(
 | 
| +  channel_factory_->CreateStreamChannel(
 | 
|        kVideoChannelName,
 | 
|        base::Bind(&ProtobufVideoReader::OnChannelReady, base::Unretained(this)));
 | 
|  }
 | 
| 
 |