gfe-relnote: (n/a) Deprecate --quic_sanitize_ack_delay.
PiperOrigin-RevId: 295158813
Change-Id: Ie966b9ef70bf22ad243303fd886a38f7e31b120f
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index a6c875b..92e6e84 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -104,8 +104,7 @@
pto_exponential_backoff_start_point_(0),
pto_rttvar_multiplier_(4),
num_tlp_timeout_ptos_(0),
- one_rtt_packet_acked_(false),
- sanitize_ack_delay_(GetQuicReloadableFlag(quic_sanitize_ack_delay)) {
+ one_rtt_packet_acked_(false) {
SetSendAlgorithm(congestion_control_type);
}
@@ -1137,8 +1136,7 @@
QuicTime ack_receive_time) {
DCHECK(packets_acked_.empty());
DCHECK_LE(largest_acked, unacked_packets_.largest_sent_packet());
- if (sanitize_ack_delay_ && ack_delay_time > peer_max_ack_delay()) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_sanitize_ack_delay);
+ if (ack_delay_time > peer_max_ack_delay()) {
ack_delay_time = peer_max_ack_delay();
}
rtt_updated_ =
diff --git a/quic/core/quic_sent_packet_manager.h b/quic/core/quic_sent_packet_manager.h
index 884b32e..61631c2 100644
--- a/quic/core/quic_sent_packet_manager.h
+++ b/quic/core/quic_sent_packet_manager.h
@@ -641,9 +641,6 @@
// True if any 1-RTT packet gets acknowledged.
bool one_rtt_packet_acked_;
-
- // Latched value of quic_sanitize_ack_delay.
- const bool sanitize_ack_delay_;
};
} // namespace quic
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc
index d3eca0e..2449cd6 100644
--- a/quic/core/quic_sent_packet_manager_test.cc
+++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -798,9 +798,7 @@
ENCRYPTION_FORWARD_SECURE));
QuicTime::Delta expected_rtt_sample =
- GetQuicReloadableFlag(quic_sanitize_ack_delay)
- ? send_delta - manager_.peer_max_ack_delay()
- : send_delta - ack_delay;
+ send_delta - manager_.peer_max_ack_delay();
EXPECT_EQ(expected_rtt_sample, manager_.GetRttStats()->latest_rtt());
}
