Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/pepper_stream_channel.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/pepper_stream_channel.h"
 
 #include "base/bind.h"
 #include "crypto/hmac.h"
 #include "jingle/glue/utils.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 63 matching lines @@
       channel_(NULL),
       connected_(false),
       ssl_client_socket_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(p2p_connect_callback_(
           this, &PepperStreamChannel::OnP2PConnect)),
       ALLOW_THIS_IN_INITIALIZER_LIST(ssl_connect_callback_(
           this, &PepperStreamChannel::OnSSLConnect)) {
 }
 
 PepperStreamChannel::~PepperStreamChannel() {
+  session_->OnDeleteChannel(this);

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

This looks like a bug-fix, necessary but unrelated to the CL?

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

Actually it wasn't a bug, and it is required for this CL. Previously
PepperStreamChannel was deleting itself and calling this method in
OnChannelDeleted(). With this change this object may be also deleted in
PepperStreamChannel, so I had to remove this call here from OnChannelDeleted().

   // Verify that the |channel_| is ether destroyed or we own it.
   DCHECK_EQ(channel_, owned_channel_.get());
   // Channel should be already destroyed if we were connected.
   DCHECK(!connected_ || channel_ == NULL);
 }
 
 void PepperStreamChannel::Connect(pp::Instance* pp_instance,
                                   const TransportConfig& transport_config,
                                   const std::string& remote_cert) {
   DCHECK(CalledOnValidThread());
@@ skipping 62 matching lines @@
     OnP2PConnect(result);
 }
 
 void PepperStreamChannel::AddRemoveCandidate(
     const cricket::Candidate& candidate) {
   DCHECK(CalledOnValidThread());
   if (channel_)
     channel_->AddRemoteCandidate(jingle_glue::SerializeP2PCandidate(candidate));
 }
 
-const std::string& PepperStreamChannel::name() {
+const std::string& PepperStreamChannel::name() const {
   DCHECK(CalledOnValidThread());
   return name_;
 }
 
+bool PepperStreamChannel::connected() const {
+  DCHECK(CalledOnValidThread());
+  return connected_;
+}
+
 void PepperStreamChannel::OnChannelDeleted() {
   if (connected_) {
     channel_ = NULL;
-    // The PepperTransportSocketAdapter is being deleted, so delete the
-    // channel too.
-    session_->OnDeleteChannel(this);
+    // The PepperTransportSocketAdapter is being deleted, so delete
+    // the channel too.
     delete this;
   }
 }
 
 void PepperStreamChannel::OnChannelNewLocalCandidate(
     const std::string& candidate) {
   DCHECK(CalledOnValidThread());
 
   cricket::Candidate candidate_value;
   if (!jingle_glue::DeserializeP2PCandidate(candidate, &candidate_value)) {
@@ skipping 79 matching lines @@
 void PepperStreamChannel::NotifyConnectFailed() {
   channel_ = NULL;
   owned_channel_.reset();
   socket_.reset();
 
   NotifyConnected(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting