Remove the non-RFC 7539 variants of ChaCha20Poly1305 crypters in QUIC

net/quic/crypto/quic_crypto_server_config.cc

Index: net/quic/crypto/quic_crypto_server_config.cc
diff --git a/net/quic/crypto/quic_crypto_server_config.cc b/net/quic/crypto/quic_crypto_server_config.cc
index 68a56587e4fdb3839f47dd70ff90d57ef11f0fc0..2d0c664974df56340745abb1e045101ea47e4356 100644
--- a/net/quic/crypto/quic_crypto_server_config.cc
+++ b/net/quic/crypto/quic_crypto_server_config.cc
@@ -294,12 +294,9 @@ QuicServerConfigProtobuf* QuicCryptoServerConfig::GenerateConfig(
   } else {
     msg.SetTaglist(kKEXS, kC255, 0);
   }
-  if (FLAGS_quic_crypto_server_config_default_has_chacha20) {
-    if (ChaCha20Poly1305Rfc7539Encrypter::IsSupported()) {
-      msg.SetTaglist(kAEAD, kAESG, kCC12, kCC20, 0);
-    } else {
-      msg.SetTaglist(kAEAD, kAESG, kCC12, 0);
-    }
+  if (FLAGS_quic_crypto_server_config_default_has_chacha20 &&
+      ChaCha20Poly1305Rfc7539Encrypter::IsSupported()) {
+    msg.SetTaglist(kAEAD, kAESG, kCC20, 0);
   } else {
     msg.SetTaglist(kAEAD, kAESG, 0);
   }