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

net/quic/crypto/chacha20_poly1305_encrypter.cc

Index: net/quic/crypto/chacha20_poly1305_encrypter.cc
diff --git a/net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.cc b/net/quic/crypto/chacha20_poly1305_encrypter.cc
similarity index 70%
rename from net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.cc
rename to net/quic/crypto/chacha20_poly1305_encrypter.cc
index a2219ae5fa9879e7319055b4e937b7dce0103fab..b438109724b0e34362bd1b235dd12d8fd5bb8eec 100644
--- a/net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.cc
+++ b/net/quic/crypto/chacha20_poly1305_encrypter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h"
+#include "net/quic/crypto/chacha20_poly1305_encrypter.h"
 
 #include <openssl/evp.h>
 
@@ -15,7 +15,7 @@ const size_t kNoncePrefixSize = 4;
 
 }  // namespace
 
-ChaCha20Poly1305Rfc7539Encrypter::ChaCha20Poly1305Rfc7539Encrypter()
+ChaCha20Poly1305Encrypter::ChaCha20Poly1305Encrypter()
     : AeadBaseEncrypter(EVP_aead_chacha20_poly1305(),
                         kKeySize,
                         kAuthTagSize,
@@ -25,10 +25,6 @@ ChaCha20Poly1305Rfc7539Encrypter::ChaCha20Poly1305Rfc7539Encrypter()
                 "nonce prefix size too big");
 }
 
-ChaCha20Poly1305Rfc7539Encrypter::~ChaCha20Poly1305Rfc7539Encrypter() {}
-
-bool ChaCha20Poly1305Rfc7539Encrypter::IsSupported() {
-  return true;
-}
+ChaCha20Poly1305Encrypter::~ChaCha20Poly1305Encrypter() {}
 
 }  // namespace net