commit a19b43d3751f76b0cf8f48061d76d318d45f1f63
author rch <rch@google.com> Fri Mar 22 13:58:37 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Mar 22 18:50:45 2019 -0700
tree 8aba27ec16852da4729382033e62f756eee7cd39
parent 639f25de4ab313199636ff860294033d74c0a2f7

gfe-relnote: Deprecate --FLAGS_gfe2_reloadable_flag_quic_fix_config_rotation

PiperOrigin-RevId: 239859039
Change-Id: I8b7afafac87efc68942dcb0f1edc3cf04c717675

quic/core/crypto/quic_crypto_server_config.cc

diff --git a/quic/core/crypto/quic_crypto_server_config.cc b/quic/core/crypto/quic_crypto_server_config.cc
index da84c24..0d2ddd9 100644
--- a/quic/core/crypto/quic_crypto_server_config.cc
+++ b/quic/core/crypto/quic_crypto_server_config.cc
@@ -1824,13 +1824,8 @@
 }
 
 bool QuicCryptoServerConfig::IsNextConfigReady(QuicWallTime now) const {
-  if (GetQuicReloadableFlag(quic_fix_config_rotation)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_fix_config_rotation);
-    return !next_config_promotion_time_.IsZero() &&
-           !next_config_promotion_time_.IsAfter(now);
-  }
   return !next_config_promotion_time_.IsZero() &&
-         next_config_promotion_time_.IsAfter(now);
+         !next_config_promotion_time_.IsAfter(now);
 }
 
 QuicCryptoServerConfig::Config::Config()

quic/core/crypto/quic_crypto_server_config_test.cc

diff --git a/quic/core/crypto/quic_crypto_server_config_test.cc b/quic/core/crypto/quic_crypto_server_config_test.cc
index cedd249..7116993 100644
--- a/quic/core/crypto/quic_crypto_server_config_test.cc
+++ b/quic/core/crypto/quic_crypto_server_config_test.cc
@@ -466,7 +466,6 @@
 };
 
 TEST_F(CryptoServerConfigsTest, AdvancePrimaryViaValidate) {
-  SetQuicReloadableFlag(quic_fix_config_rotation, true);
   // Check that a new primary config is enabled at the right time.
   SetConfigs({{"a", 900, 1}, {"b", 1100, 1}});
   test_peer_.SelectNewPrimaryConfig(1000);