Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/rtp_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/rtp_video_reader.h"
 
 #include "base/bind.h"
 #include "base/task.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/session.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 const int kMaxPacketsInQueue = 1024;
 const int kReceiverReportsIntervalMs = 1000;
 }  // namespace
 
 RtpVideoReader::PacketsQueueEntry::PacketsQueueEntry()
     : received(false),
       packet(NULL) {
 }
 
 RtpVideoReader::RtpVideoReader(base::MessageLoopProxy* message_loop)
-    : initialized_(false),
+    : session_(NULL),
+      initialized_(false),
       rtcp_writer_(message_loop),
       last_sequence_number_(0),
       video_stub_(NULL) {
 }
 
 RtpVideoReader::~RtpVideoReader() {
+  if (session_) {
+    session_->CancelChannelCreation(kVideoRtpChannelName);
+    session_->CancelChannelCreation(kVideoRtcpChannelName);
+  }
   ResetQueue();
 }
 
 void RtpVideoReader::Init(protocol::Session* session,
                           VideoStub* video_stub,
                           const InitializedCallback& callback) {
+  session_ = session;
   initialized_callback_ = callback;
   video_stub_ = video_stub;
 
-  session->CreateDatagramChannel(
+  session_->CreateDatagramChannel(
       kVideoRtpChannelName,
       base::Bind(&RtpVideoReader::OnChannelReady,
                  base::Unretained(this), true));
-  session->CreateDatagramChannel(
+  session_->CreateDatagramChannel(
       kVideoRtcpChannelName,
       base::Bind(&RtpVideoReader::OnChannelReady,
                  base::Unretained(this), false));
 }
 
 void RtpVideoReader::OnChannelReady(bool rtp, net::Socket* socket) {
   if (!socket) {
     if (!initialized_) {
       initialized_ = true;
       initialized_callback_.Run(false);
@@ skipping 164 matching lines @@
     RtcpReceiverReport report;
     rtp_reader_.GetReceiverReport(&report);
     rtcp_writer_.SendReport(report);
 
     last_receiver_report_ = now;
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting