Replace --gfe2_reloadable_flag_quic_add_cached_network_parameters_to_address_token by --gfe2_reloadable_flag_quic_add_cached_network_parameters_to_address_token2.
PiperOrigin-RevId: 412079594
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index cb05e78..29e6377 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -1677,7 +1677,7 @@
server_session->GetCryptoStream())
->PreviousCachedNetworkParams();
if (GetQuicReloadableFlag(
- quic_add_cached_network_parameters_to_address_token)) {
+ quic_add_cached_network_parameters_to_address_token2)) {
ASSERT_NE(server_received_network_params, nullptr);
// QuicSentPacketManager::SetInitialRtt clamps the initial_rtt to between
// [min_initial_rtt, max_initial_rtt].
@@ -1761,7 +1761,7 @@
}
TEST_P(EndToEndTest, AddressTokenRefreshedByServer) {
- SetQuicReloadableFlag(quic_add_cached_network_parameters_to_address_token,
+ SetQuicReloadableFlag(quic_add_cached_network_parameters_to_address_token2,
true);
ASSERT_TRUE(Initialize());
if (!version_.HasIetfQuicFrames()) {
@@ -1789,7 +1789,7 @@
}
ASSERT_TRUE(!old_address_token.empty());
- SetQuicReloadableFlag(quic_add_cached_network_parameters_to_address_token,
+ SetQuicReloadableFlag(quic_add_cached_network_parameters_to_address_token2,
false);
// The 0-RTT handshake should succeed.
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc
index bde1384..30c4178 100644
--- a/quic/core/http/quic_server_session_base_test.cc
+++ b/quic/core/http/quic_server_session_base_test.cc
@@ -644,7 +644,7 @@
SendServerConfigUpdate(EqualsProto(expected_network_params)))
.Times(1);
} else if (!GetQuicReloadableFlag(
- quic_add_cached_network_parameters_to_address_token)) {
+ quic_add_cached_network_parameters_to_address_token2)) {
EXPECT_CALL(*tls_server_stream,
SendServerConfigUpdate(EqualsProto(expected_network_params)))
.Times(1);
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 518b7c3..9942173 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -20,7 +20,7 @@
// If bytes in flight has dipped below 1.25*MaxBW in the last round, do not exit PROBE_UP due to excess queue buildup.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_no_probe_up_exit_if_no_queue, true)
// If true, 1) NEW_TOKENs sent from a IETF QUIC session will include the cached network parameters proto, 2) A min_rtt received from a validated token will be used to set the initial rtt, 3) Enable bandwidth resumption for IETF QUIC when connection options BWRE or BWMX exists.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_cached_network_parameters_to_address_token, false)
+QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_cached_network_parameters_to_address_token2, false)
// If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false)
// If true, QUIC won\'t honor the connection option TLPR
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 4664a44..14d549a 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1702,7 +1702,7 @@
cached_network_params.has_value()) {
connection()->OnSendConnectionState(*cached_network_params);
QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_add_cached_network_parameters_to_address_token, 1, 2);
+ quic_add_cached_network_parameters_to_address_token2, 1, 2);
}
return true;
}
@@ -2669,7 +2669,7 @@
cached_network_params->timestamp() > 0) {
connection()->OnReceiveConnectionState(*cached_network_params);
QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_add_cached_network_parameters_to_address_token, 2, 2);
+ quic_add_cached_network_parameters_to_address_token2, 2, 2);
}
}
return valid;
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index db898d2..d06e1fe 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -1013,7 +1013,7 @@
const bool add_cached_network_parameters_to_address_token_ =
GetQuicReloadableFlag(
- quic_add_cached_network_parameters_to_address_token);
+ quic_add_cached_network_parameters_to_address_token2);
// Whether BoringSSL randomizes the order of TLS extensions.
bool permutes_tls_extensions_ = true;