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

net/quic/crypto/quic_encrypter.cc

Index: net/quic/crypto/quic_encrypter.cc
diff --git a/net/quic/crypto/quic_encrypter.cc b/net/quic/crypto/quic_encrypter.cc
index e483b6f48c7ebe3bbaaf18a7bb8aa0b9cbb6d20a..917d23ba5dd4c2b5199a856ac41762f712c3bc2d 100644
--- a/net/quic/crypto/quic_encrypter.cc
+++ b/net/quic/crypto/quic_encrypter.cc
@@ -5,7 +5,7 @@
 #include "net/quic/crypto/quic_encrypter.h"
 
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
-#include "net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h"
+#include "net/quic/crypto/chacha20_poly1305_encrypter.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/null_encrypter.h"
 
@@ -17,7 +17,7 @@ QuicEncrypter* QuicEncrypter::Create(QuicTag algorithm) {
     case kAESG:
       return new Aes128Gcm12Encrypter();
     case kCC20:
-      return new ChaCha20Poly1305Rfc7539Encrypter();
+      return new ChaCha20Poly1305Encrypter();
     case kNULL:
       return new NullEncrypter();
     default: