Land Recent QUIC Changes.

net/quic/test_tools/mock_crypto_client_stream.h

 // Copyright (c) 2013 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 NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
 #define NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
 
 #include <string>
 
 #include "net/quic/crypto/crypto_handshake.h"
@@ skipping 21 matching lines @@
     // nor confirm the handshake
     COLD_START,
   };
 
   MockCryptoClientStream(
       const string& server_hostname,
       QuicSession* session,
       QuicCryptoClientConfig* crypto_config,
       HandshakeMode handshake_mode,
       const SSLInfo* ssl_info);
-  virtual ~MockCryptoClientStream();
+  virtual ~MockCryptoClientStream() OVERRIDE;
 
   // CryptoFramerVisitorInterface implementation.
   virtual void OnHandshakeMessage(
       const CryptoHandshakeMessage& message) OVERRIDE;
 
   // QuicCryptoClientStream implementation.
   virtual bool CryptoConnect() OVERRIDE;
 
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
   // Invokes the sessions's CryptoHandshakeEvent method with the specified
   // event.
   void SendOnCryptoHandshakeEvent(QuicSession::CryptoHandshakeEvent event);
 
   HandshakeMode handshake_mode_;
 
  private:
   void SetConfigNegotiated();
 
   const SSLInfo* ssl_info_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_