Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/jingle_session.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/jingle_session.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/rand_util.h"
@@ skipping 154 matching lines @@
 }
 
 void JingleSession::CreateDatagramChannel(
     const std::string& name, const DatagramChannelCallback& callback) {
   DCHECK(CalledOnValidThread());
 
   AddChannelConnector(
       name, new JingleDatagramConnector(this, name, callback));
 }
 
+void JingleSession::CancelChannelCreation(const std::string& name) {
+  ChannelConnectorsMap::iterator it = channel_connectors_.find(name);
+  if (it != channel_connectors_.end()) {
+    delete it->second;
+    channel_connectors_.erase(it);
+  }
+}
+
 net::Socket* JingleSession::control_channel() {
   DCHECK(CalledOnValidThread());
   return control_channel_socket_.get();
 }
 
 net::Socket* JingleSession::event_channel() {
   DCHECK(CalledOnValidThread());
   return event_channel_socket_.get();
 }
 
@@ skipping 240 matching lines @@
   // Workaround bug in libjingle - it doesn't connect channels if they
   // are created after the session is accepted. See crbug.com/89384.
   // TODO(sergeyu): Fix the bug and remove this line.
   cricket_session_->GetTransport(content_name)->ConnectChannels();
 }
 
 void JingleSession::OnChannelConnectorFinished(
     const std::string& name, JingleChannelConnector* connector) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(channel_connectors_[name], connector);
-  channel_connectors_[name] = NULL;
+  channel_connectors_.erase(name);
 }
 
 void JingleSession::CreateChannels() {
   CreateStreamChannel(
       kControlChannelName,
       base::Bind(&JingleSession::OnChannelConnected,
                  base::Unretained(this), &control_channel_socket_));
   CreateStreamChannel(
       kEventChannelName,
       base::Bind(&JingleSession::OnChannelConnected,
@@ skipping 39 matching lines @@
     DCHECK_NE(state_, FAILED);
 
     state_ = new_state;
     if (!state_change_callback_.is_null())
       state_change_callback_.Run(new_state);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting