gfe-relnote: Deprecate gfe2_reloadable_flag_quic_enable_pto.
PiperOrigin-RevId: 289149900
Change-Id: I6eaff9cd45487f4506da63e102f849ac0c44f56e
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index c5d14ec..352cd37 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -396,9 +396,7 @@
copt.push_back(kTPCC);
}
copt.push_back(GetParam().priority_tag);
- if (GetQuicReloadableFlag(quic_enable_pto)) {
- copt.push_back(k2PTO);
- }
+ copt.push_back(k2PTO);
if (VersionHasIetfQuicFrames(negotiated_version_.transport_version)) {
copt.push_back(kILD0);
}
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index b5161d4..a36ea2a 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -448,11 +448,9 @@
}
if (config.HasClientSentConnectionOption(k7PTO, perspective_)) {
max_consecutive_ptos_ = 6;
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 3, 8);
}
if (config.HasClientSentConnectionOption(k8PTO, perspective_)) {
max_consecutive_ptos_ = 7;
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 4, 8);
}
}
if (config.HasClientSentConnectionOption(kNSTP, perspective_)) {
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index baa41be..6938427 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -9313,7 +9313,6 @@
}
TEST_P(QuicConnectionTest, ProbeTimeout) {
- SetQuicReloadableFlag(quic_enable_pto, true);
QuicConfig config;
QuicTagVector connection_options;
connection_options.push_back(k2PTO);
@@ -9341,7 +9340,6 @@
}
TEST_P(QuicConnectionTest, CloseConnectionAfter6ClientPTOs) {
- SetQuicReloadableFlag(quic_enable_pto, true);
QuicConfig config;
QuicTagVector connection_options;
connection_options.push_back(k1PTO);
@@ -9379,7 +9377,6 @@
}
TEST_P(QuicConnectionTest, CloseConnectionAfter7ClientPTOs) {
- SetQuicReloadableFlag(quic_enable_pto, true);
QuicConfig config;
QuicTagVector connection_options;
connection_options.push_back(k2PTO);
@@ -9416,7 +9413,6 @@
}
TEST_P(QuicConnectionTest, CloseConnectionAfter8ClientPTOs) {
- SetQuicReloadableFlag(quic_enable_pto, true);
QuicConfig config;
QuicTagVector connection_options;
connection_options.push_back(k2PTO);
@@ -9607,7 +9603,6 @@
}
TEST_P(QuicConnectionTest, PtoSkipsPacketNumber) {
- SetQuicReloadableFlag(quic_enable_pto, true);
SetQuicReloadableFlag(quic_skip_packet_number_for_pto, true);
QuicConfig config;
QuicTagVector connection_options;
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index 6f5e348..842e5e8 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -148,16 +148,12 @@
min_rto_timeout_ = kAlarmGranularity;
}
- if (GetQuicReloadableFlag(quic_enable_pto)) {
- if (config.HasClientSentConnectionOption(k2PTO, perspective)) {
- pto_enabled_ = true;
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 2, 8);
- }
- if (config.HasClientSentConnectionOption(k1PTO, perspective)) {
- pto_enabled_ = true;
- max_probe_packets_per_pto_ = 1;
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 1, 8);
- }
+ if (config.HasClientSentConnectionOption(k2PTO, perspective)) {
+ pto_enabled_ = true;
+ }
+ if (config.HasClientSentConnectionOption(k1PTO, perspective)) {
+ pto_enabled_ = true;
+ max_probe_packets_per_pto_ = 1;
}
if (GetQuicReloadableFlag(quic_skip_packet_number_for_pto) &&
@@ -174,19 +170,15 @@
if (pto_enabled_) {
if (config.HasClientSentConnectionOption(kPTOA, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 5, 8);
always_include_max_ack_delay_for_pto_timeout_ = false;
}
if (config.HasClientSentConnectionOption(kPEB1, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 6, 8);
StartExponentialBackoffAfterNthPto(1);
}
if (config.HasClientSentConnectionOption(kPEB2, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 7, 8);
StartExponentialBackoffAfterNthPto(2);
}
if (config.HasClientSentConnectionOption(kPVS1, perspective)) {
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_enable_pto, 8, 8);
pto_rttvar_multiplier_ = 2;
}
if (config.HasClientSentConnectionOption(kPAG1, perspective)) {
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index 7e8e3e7..c08a517 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -317,7 +317,6 @@
}
void EnablePto(QuicTag tag) {
- SetQuicReloadableFlag(quic_enable_pto, true);
QuicConfig config;
QuicTagVector options;
options.push_back(tag);
