Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/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_SESSION_H_
 #define REMOTING_PROTOCOL_SESSION_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 72 matching lines @@
   // callback is called with NULL if connection failed for any reason.
   // Ownership of the channel socket is given to the caller when the
   // callback is called. All channels must be destroyed before the
   // session is destroyed. Can be called only when in CONNECTING or
   // CONNECTED state.
   virtual void CreateStreamChannel(
       const std::string& name, const StreamChannelCallback& callback) = 0;
   virtual void CreateDatagramChannel(
       const std::string& name, const DatagramChannelCallback& callback) = 0;
 
+  // Cancels creation of the channel |name| for previous
+  // CreateStreamChannel() and CreateDatagramChannel() calls. Can be

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

Wording is a little confusing.  I'd suggest:

"Cancels a pending CreateStreamChannel() or CreateDatagramChannel() operation
for the named channel.  If the channel creation already completed then
cancelling it has no effect."

Except that, looking at the Pepper implementation of CancelChannelCreation(), I
think it actually tears down the channel, doesn't it?

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

Done. Thanks for suggestion.
It tears it down only when it is not connected, i.e. is_connected()==false.

+  // called to cancel channel creation before it is finished. Call is
+  // no-op if the channel is not being created.
+  virtual void CancelChannelCreation(const std::string& name) = 0;
+
   // TODO(sergeyu): Remove these methods, and use CreateChannel()
   // instead.
   virtual net::Socket* control_channel() = 0;
   virtual net::Socket* event_channel() = 0;
 
   // JID of the other side.
   virtual const std::string& jid() = 0;
 
   // Configuration of the protocol that was sent or received in the
   // session-initiate jingle message. Returned pointer is valid until
@@ skipping 25 matching lines @@
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_