Land Recent QUIC Changes.

net/quic/quic_crypto_client_stream.h

 // Copyright (c) 2012 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_QUIC_CRYPTO_CLIENT_STREAM_H_
 #define NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_
 
 #include <string>
 
 #include "net/cert/cert_verify_result.h"
@@ skipping 11 matching lines @@
 
 namespace test {
 class CryptoTestUtils;
 }  // namespace test
 
 class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
  public:
   QuicCryptoClientStream(const string& server_hostname,
                          QuicSession* session,
                          QuicCryptoClientConfig* crypto_config);
-  virtual ~QuicCryptoClientStream();
+  virtual ~QuicCryptoClientStream() OVERRIDE;
 
   // CryptoFramerVisitorInterface implementation
   virtual void OnHandshakeMessage(
       const CryptoHandshakeMessage& message) OVERRIDE;
 
   // Performs a crypto handshake with the server. Returns true if the crypto
   // handshake is started successfully.
   // TODO(agl): this should probably return void.
   virtual bool CryptoConnect();
 
   // num_sent_client_hellos returns the number of client hello messages that
   // have been sent. If the handshake has completed then this is one greater
   // than the number of round-trips needed for the handshake.
   int num_sent_client_hellos() const;
 
   // Gets the SSL connection information.
   virtual bool GetSSLInfo(SSLInfo* ssl_info);
 
  private:
   // ProofVerifierCallbackImpl is passed as the callback method to VerifyProof.
   // The ProofVerifier calls this class with the result of proof verification
   // when verification is performed asynchronously.
   class ProofVerifierCallbackImpl : public ProofVerifierCallback {
    public:
     explicit ProofVerifierCallbackImpl(QuicCryptoClientStream* stream);
-    virtual ~ProofVerifierCallbackImpl();
+    virtual ~ProofVerifierCallbackImpl() OVERRIDE;
 
     // ProofVerifierCallback interface.
     virtual void Run(bool ok,
                      const string& error_details,
                      scoped_ptr<ProofVerifyDetails>* details) OVERRIDE;
 
     // Cancel causes any future callbacks to be ignored. It must be called on
     // the same thread as the callback will be made on.
     void Cancel();
 
@@ skipping 45 matching lines @@
 
   // The result of certificate verification.
   scoped_ptr<CertVerifyResult> cert_verify_result_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_H_