Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/jingle_session.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/task.h"
 #include "crypto/rsa_private_key.h"
@@ skipping 18 matching lines @@
   // Session interface.
   virtual void SetStateChangeCallback(
       const StateChangeCallback& callback) OVERRIDE;
   virtual Error error() OVERRIDE;
   virtual void CreateStreamChannel(
       const std::string& name,
       const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
       const std::string& name,
       const DatagramChannelCallback& callback) OVERRIDE;
+  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
   virtual net::Socket* control_channel() OVERRIDE;
   virtual net::Socket* event_channel() OVERRIDE;
   virtual const std::string& jid() OVERRIDE;
   virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
   virtual const SessionConfig& config() OVERRIDE;
   virtual void set_config(const SessionConfig& config) OVERRIDE;
   virtual const std::string& initiator_token() OVERRIDE;
   virtual void set_initiator_token(const std::string& initiator_token) OVERRIDE;
   virtual const std::string& receiver_token() OVERRIDE;
   virtual void set_receiver_token(const std::string& receiver_token) OVERRIDE;
   virtual void set_shared_secret(const std::string& secret) OVERRIDE;
   virtual const std::string& shared_secret() OVERRIDE;
   virtual void Close() OVERRIDE;
 
  private:
   friend class JingleDatagramConnector;
   friend class JingleSessionManager;
   friend class JingleStreamConnector;
 
+  typedef std::map<std::string, JingleChannelConnector*> ChannelConnectorsMap;
+
   // Create a JingleSession used in client mode. A server certificate is
   // required.
   static JingleSession* CreateClientSession(JingleSessionManager* manager,
                                             const std::string& host_public_key);
 
   // Create a JingleSession used in server mode. A server certificate and
   // private key is provided. |key| is copied in the constructor.
   //
   // TODO(sergeyu): Remove |certificate| and |key| when we stop using TLS.
   static JingleSession* CreateServerSession(
@@ skipping 100 matching lines @@
   SessionConfig config_;
   bool config_set_;
 
   std::string initiator_token_;
   std::string receiver_token_;
 
   // These data members are only set on the receiving side.
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
 
   // Channels that are currently being connected.
-  std::map<std::string, JingleChannelConnector*> channel_connectors_;
+  ChannelConnectorsMap channel_connectors_;
 
   scoped_ptr<net::Socket> control_channel_socket_;
   scoped_ptr<net::Socket> event_channel_socket_;
 
   ScopedRunnableMethodFactory<JingleSession> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_