Deprecate FLAGS_quic_send_scfg_ttl

net/quic/core/crypto/quic_crypto_server_config.cc

Index: net/quic/core/crypto/quic_crypto_server_config.cc
diff --git a/net/quic/core/crypto/quic_crypto_server_config.cc b/net/quic/core/crypto/quic_crypto_server_config.cc
index 15ec453df3e18d222c93feea9a0893e4f70aaedd..fbfc92cf27ae1b42b934fc91d9c410dce3e6fabb 100644
--- a/net/quic/core/crypto/quic_crypto_server_config.cc
+++ b/net/quic/core/crypto/quic_crypto_server_config.cc
@@ -1401,10 +1401,8 @@ bool QuicCryptoServerConfig::BuildServerConfigUpdateMessage(
   out->set_tag(kSCUP);
   out->SetStringPiece(kSCFG, serialized);
   out->SetStringPiece(kSourceAddressTokenTag, source_address_token);
-  if (FLAGS_quic_send_scfg_ttl) {
-    out->SetValue(kSTTL,
-                  expiry_time.AbsoluteDifference(clock->WallNow()).ToSeconds());
-  }
+  out->SetValue(kSTTL,
+                expiry_time.AbsoluteDifference(clock->WallNow()).ToSeconds());
 
   scoped_refptr<ProofSource::Chain> chain;
   string signature;
@@ -1571,10 +1569,7 @@ void QuicCryptoServerConfig::BuildRejection(
       kSourceAddressTokenTag,
       NewSourceAddressToken(config, info.source_address_tokens, info.client_ip,
                             rand, info.now, &cached_network_params));
-  if (FLAGS_quic_send_scfg_ttl) {
-    out->SetValue(kSTTL,
-                  config.expiry_time.AbsoluteDifference(now).ToSeconds());
-  }
+  out->SetValue(kSTTL, config.expiry_time.AbsoluteDifference(now).ToSeconds());
   if (replay_protection_) {
     out->SetStringPiece(kServerNonceTag, NewServerNonce(rand, info.now));
   }
@@ -1832,14 +1827,12 @@ QuicCryptoServerConfig::ParseConfigProtobuf(
     config->key_exchanges.push_back(ka.release());
   }
 
-  if (FLAGS_quic_send_scfg_ttl) {
-    uint64_t expiry_seconds;
-    if (msg->GetUint64(kEXPY, &expiry_seconds) != QUIC_NO_ERROR) {
-      LOG(WARNING) << "Server config message is missing EXPY";
-      return nullptr;
-    }
-    config->expiry_time = QuicWallTime::FromUNIXSeconds(expiry_seconds);
+  uint64_t expiry_seconds;
+  if (msg->GetUint64(kEXPY, &expiry_seconds) != QUIC_NO_ERROR) {
+    LOG(WARNING) << "Server config message is missing EXPY";
+    return nullptr;
   }
+  config->expiry_time = QuicWallTime::FromUNIXSeconds(expiry_seconds);
 
   return config;
 }