Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/rtp_video_writer.cc

 // Copyright (c) 2010 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_writer.h"
 
 #include "base/bind.h"
 #include "base/task.h"
 #include "net/base/io_buffer.h"
 #include "remoting/base/compound_buffer.h"
 #include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/rtp_writer.h"
 #include "remoting/protocol/session.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 const int kMtu = 1200;
 }  // namespace
 
 RtpVideoWriter::RtpVideoWriter(base::MessageLoopProxy* message_loop)
-    : initialized_(false),
+    : session_(NULL),
+      initialized_(false),
       rtp_writer_(message_loop) {
 }
 
 RtpVideoWriter::~RtpVideoWriter() {
   Close();
 }
 
 void RtpVideoWriter::Init(protocol::Session* session,
                           const InitializedCallback& callback) {
+  session_ = session;
   initialized_callback_ = callback;
   session->CreateDatagramChannel(
       kVideoRtpChannelName,
       base::Bind(&RtpVideoWriter::OnChannelReady,
                  base::Unretained(this), true));
   session->CreateDatagramChannel(
       kVideoRtcpChannelName,
       base::Bind(&RtpVideoWriter::OnChannelReady,
                  base::Unretained(this), false));
 }
@@ skipping 21 matching lines @@
     DCHECK(!initialized_);
     initialized_ = true;
     initialized_callback_.Run(true);
   }
 }
 
 void RtpVideoWriter::Close() {
   rtp_writer_.Close();
   rtp_channel_.reset();
   rtcp_channel_.reset();
+  if (session_) {
+    session_->CancelChannelCreation(kVideoRtpChannelName);
+    session_->CancelChannelCreation(kVideoRtcpChannelName);
+  }

[Wez, 2011/11/15 22:29:13]

Shouldn't this also clear |session_|?  Can we just get rid of Close() and rely
on the dtor?

[Sergey Ulanov, 2011/11/16 00:01:33]

Done.
Maybe, but I'd like to do it in a separate CL.

 }
 
 void RtpVideoWriter::ProcessVideoPacket(const VideoPacket* packet,
                                         const base::Closure& done) {
   CHECK(packet->format().encoding() == VideoPacketFormat::ENCODING_VP8)
       << "Only VP8 is supported in RTP.";
 
   CompoundBuffer payload;
   // TODO(sergeyu): This copy would not be necessary CompoundBuffer was used
   // inside of VideoPacket.
@@ skipping 46 matching lines @@
 
   done.Run();
 }
 
 int RtpVideoWriter::GetPendingPackets() {
   return rtp_writer_.GetPendingPackets();
 }
 
 }  // namespace protocol
 }  // namespace remoting