Land Recent QUIC Changes.

net/quic/crypto/p256_key_exchange.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_CRYPTO_P256_KEY_EXCHANGE_H_
 #define NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
 #include "crypto/ec_private_key.h"
 #include "crypto/scoped_nss_types.h"
 #endif
 
 namespace net {
 
 // P256KeyExchange implements a KeyExchange using elliptic-curve
 // Diffie-Hellman on NIST P-256.
 class NET_EXPORT_PRIVATE P256KeyExchange : public KeyExchange {
  public:
-  virtual ~P256KeyExchange();
+  virtual ~P256KeyExchange() OVERRIDE;
 
   // New creates a new key exchange object from a private key. If
   // |private_key| is invalid, NULL is returned.
   static P256KeyExchange* New(base::StringPiece private_key);
 
   // |NewPrivateKey| returns a private key, suitable for passing to |New|.
   // If |NewPrivateKey| can't generate a private key, it returns an empty
   // string.
   static std::string NewPrivateKey();
 
@@ skipping 29 matching lines @@
 
   scoped_ptr<crypto::ECPrivateKey> key_pair_;
 #endif
   // The public key stored as an uncompressed P-256 point.
   uint8 public_key_[kUncompressedP256PointBytes];
 };
 
 }  // namespace net
 #endif  // NET_QUIC_CRYPTO_P256_KEY_EXCHANGE_H_