Landing Recent QUIC changes until 4/22/2016 14:55 UTC

net/quic/crypto/quic_decrypter.cc

Index: net/quic/crypto/quic_decrypter.cc
diff --git a/net/quic/crypto/quic_decrypter.cc b/net/quic/crypto/quic_decrypter.cc
index 193d1e87eb4a0a44774df4670268d6eb3f47eba4..7b2df54d1372baccd2be4f53e1a3b0f8c1f2fcec 100644
--- a/net/quic/crypto/quic_decrypter.cc
+++ b/net/quic/crypto/quic_decrypter.cc
@@ -6,7 +6,7 @@
 
 #include "crypto/hkdf.h"
 #include "net/quic/crypto/aes_128_gcm_12_decrypter.h"
-#include "net/quic/crypto/chacha20_poly1305_rfc7539_decrypter.h"
+#include "net/quic/crypto/chacha20_poly1305_decrypter.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/null_decrypter.h"
 
@@ -21,7 +21,7 @@ QuicDecrypter* QuicDecrypter::Create(QuicTag algorithm) {
     case kAESG:
       return new Aes128Gcm12Decrypter();
     case kCC20:
-      return new ChaCha20Poly1305Rfc7539Decrypter();
+      return new ChaCha20Poly1305Decrypter();
     case kNULL:
       return new NullDecrypter();
     default: