Deprecate FLAGS_quic_send_scfg_ttl

net/quic/core/crypto/quic_crypto_server_config.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/crypto/quic_crypto_server_config.h"
 
 #include <stdlib.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1383 matching lines @@
     common_cert_sets = primary_config_->common_cert_sets;
     expiry_time = primary_config_->expiry_time;
     source_address_token = NewSourceAddressToken(
         *primary_config_, previous_source_address_tokens, client_ip, rand,
         clock->WallNow(), cached_network_params);
   }
 
   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;
   string cert_sct;
   if (!proof_source_->GetProof(server_ip, params.sni, serialized, version,
                                chlo_hash, &chain, &signature, &cert_sct)) {
     DVLOG(1) << "Server: failed to get proof.";
     return false;
   }
 
@@ skipping 146 matching lines @@
     out->set_tag(kSREJ);
     out->SetValue(kRCID, server_designated_connection_id);
   } else {
     out->set_tag(kREJ);
   }
   out->SetStringPiece(kSCFG, config.serialized);
   out->SetStringPiece(
       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));
   }
 
   // Send client the reject reason for debugging purposes.
   DCHECK_LT(0u, info.reject_reasons.size());
   out->SetVector(kRREJ, info.reject_reasons);
 
   // The client may have requested a certificate chain.
   if (!ClientDemandsX509Proof(client_hello)) {
@@ skipping 237 matching lines @@
     for (const KeyExchange* key_exchange : config->key_exchanges) {
       if (key_exchange->tag() == tag) {
         LOG(WARNING) << "Duplicate key exchange in config: " << tag;
         return nullptr;
       }
     }
 
     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;
 }
 
 void QuicCryptoServerConfig::SetEphemeralKeySource(
     EphemeralKeySource* ephemeral_key_source) {
   ephemeral_key_source_.reset(ephemeral_key_source);
 }
 
 void QuicCryptoServerConfig::SetStrikeRegisterClient(
@@ skipping 309 matching lines @@
       priority(0),
       source_address_token_boxer(nullptr) {}
 
 QuicCryptoServerConfig::Config::~Config() {
   base::STLDeleteElements(&key_exchanges);
 }
 
 QuicCryptoProof::QuicCryptoProof() {}
 QuicCryptoProof::~QuicCryptoProof() {}
 }  // namespace net