Land Recent QUIC Changes.

net/quic/crypto/proof_verifier_chromium.h

 // Copyright 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_CRYPTO_PROOF_VERIFIER_CHROMIUM_H_
 #define NET_QUIC_CRYPTO_PROOF_VERIFIER_CHROMIUM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 18 matching lines @@
  public:
   CertVerifyResult cert_verify_result;
 };
 
 // ProofVerifierChromium implements the QUIC ProofVerifier interface.
 // TODO(rtenneti): Add support for multiple requests for one ProofVerifier.
 class NET_EXPORT_PRIVATE ProofVerifierChromium : public ProofVerifier {
  public:
   ProofVerifierChromium(CertVerifier* cert_verifier,
                         const BoundNetLog& net_log);
-  virtual ~ProofVerifierChromium();
+  virtual ~ProofVerifierChromium() OVERRIDE;
 
   // ProofVerifier interface
   virtual Status VerifyProof(const std::string& hostname,
                              const std::string& server_config,
                              const std::vector<std::string>& certs,
                              const std::string& signature,
                              std::string* error_details,
                              scoped_ptr<ProofVerifyDetails>* details,
                              ProofVerifierCallback* callback) OVERRIDE;
 
@@ skipping 30 matching lines @@
   State next_state_;
 
   BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(ProofVerifierChromium);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_PROOF_VERIFIER_CHROMIUM_H_