Land Recent QUIC changes

net/quic/crypto/curve25519_key_exchange.h

Index: net/quic/crypto/curve25519_key_exchange.h
diff --git a/net/quic/crypto/curve25519_key_exchange.h b/net/quic/crypto/curve25519_key_exchange.h
index 73cf7416fdd1fb040d139fd98215a1be2391f64e..ecc0880ce67ed5c22e3fb6815fd16938d5032a2b 100644
--- a/net/quic/crypto/curve25519_key_exchange.h
+++ b/net/quic/crypto/curve25519_key_exchange.h
@@ -31,10 +31,11 @@ class NET_EXPORT_PRIVATE Curve25519KeyExchange : public KeyExchange {
   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();