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 22 matching lines @@
   // 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();
 
   // KeyExchange interface.
+  virtual KeyExchange* NewKeyPair(QuicRandom* rand) const OVERRIDE;
   virtual bool CalculateSharedKey(const base::StringPiece& peer_public_value,
                                   std::string* shared_key) const OVERRIDE;
   virtual base::StringPiece public_value() const OVERRIDE;
-  virtual CryptoTag tag() const OVERRIDE;
+  virtual QuicTag tag() const OVERRIDE;
 
  private:
   enum {
     // A P-256 field element consists of 32 bytes.
     kP256FieldBytes = 32,
     // A P-256 point in uncompressed form consists of 0x04 (to denote
     // that the point is uncompressed) followed by two, 32-byte field
     // elements.
     kUncompressedP256PointBytes = 1 + 2 * kP256FieldBytes,
     // The first byte in an uncompressed P-256 point.
@@ skipping 13 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_