Add CancelChannelCreation() in protocol::Session interface.

remoting/protocol/fake_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_FAKE_SESSION_H_
 #define REMOTING_PROTOCOL_FAKE_SESSION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 120 matching lines @@
   }
 
   void set_error(Session::Error error) { error_ = error; }
 
   bool is_closed() const { return closed_; }
 
   FakeSocket* GetStreamChannel(const std::string& name);
   FakeUdpSocket* GetDatagramChannel(const std::string& name);
 
   // Session interface.
-  virtual void SetStateChangeCallback(const StateChangeCallback& callback);
+  virtual void SetStateChangeCallback(
+      const StateChangeCallback& callback) OVERRIDE;
 
-  virtual Session::Error error();
+  virtual Session::Error error() OVERRIDE;
 
   virtual void CreateStreamChannel(
-      const std::string& name, const StreamChannelCallback& callback);
+      const std::string& name, const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
-      const std::string& name, const DatagramChannelCallback& callback);
+      const std::string& name,
+      const DatagramChannelCallback& callback) OVERRIDE;
+  virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
 
-  virtual FakeSocket* control_channel();
-  virtual FakeSocket* event_channel();
+  virtual FakeSocket* control_channel() OVERRIDE;
+  virtual FakeSocket* event_channel() OVERRIDE;
 
-  virtual const std::string& jid();
+  virtual const std::string& jid() OVERRIDE;
 
-  virtual const CandidateSessionConfig* candidate_config();
-  virtual const SessionConfig& config();
-  virtual void set_config(const SessionConfig& config);
+  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();
-  virtual void set_initiator_token(const std::string& initiator_token);
-  virtual const std::string& receiver_token();
-  virtual void set_receiver_token(const std::string& receiver_token);
+  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);
-  virtual const std::string& shared_secret();
+  virtual void set_shared_secret(const std::string& secret) OVERRIDE;
+  virtual const std::string& shared_secret() OVERRIDE;
 
-  virtual void Close();
+  virtual void Close() OVERRIDE;

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

nit: These aren't related to this CL?

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

CancelChannelCreation() is a new method in Session interface, and this header
would be inconsistent if I had OVERRIDE only for one method, so I had to add
OVERRIDE for all other methods.

 
  public:
   StateChangeCallback callback_;
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
   SessionConfig config_;
   MessageLoop* message_loop_;
   FakeSocket control_channel_;
   FakeSocket event_channel_;
 
   std::map<std::string, FakeSocket*> stream_channels_;
   std::map<std::string, FakeUdpSocket*> datagram_channels_;
 
   std::string initiator_token_;
   std::string receiver_token_;
 
   std::string shared_secret_;
 
   std::string jid_;
 
   Session::Error error_;
   bool closed_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_FAKE_SESSION_H_