Land Recent QUIC changes

net/quic/crypto/curve25519_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_CURVE25519_KEY_EXCHANGE_H_
 #define NET_QUIC_CRYPTO_CURVE25519_KEY_EXCHANGE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 13 matching lines @@
 
   // New creates a new object from a private key. If the private key is
   // invalid, NULL is returned.
   static Curve25519KeyExchange* New(const base::StringPiece& private_key);
 
   // NewPrivateKey returns a private key, generated from |rand|, suitable for
   // passing to |New|.
   static std::string NewPrivateKey(QuicRandom* rand);
 
   // 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:
   Curve25519KeyExchange();
 
   uint8 private_key_[32];
   uint8 public_key_[32];
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CURVE25519_KEY_EXCHANGE_H_