Automated g4 rollback of changelist 257008406.
*** Reason for rollback ***
To allow this flag to be turned off in chromium due to b/137681973.
*** Original change description ***
gfe-relnote: Deprecate gfe2_reloadable_flag_quic_simplify_stop_waiting.
***
PiperOrigin-RevId: 258640921
Change-Id: I26998bd7dfc8fdeb297ce4e4f77d2e06b65dd19d
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index ecab751..22ee18a 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -991,8 +991,12 @@
// If the incoming ack's packets set expresses received packets: peer is still
// acking packets which we never care about.
// Send an ack to raise the high water mark.
- const bool send_stop_waiting =
- no_stop_waiting_frames_ ? false : GetLeastUnacked() > start;
+ bool send_stop_waiting = GetLeastUnacked() > start;
+ if (GetQuicReloadableFlag(quic_simplify_stop_waiting) &&
+ no_stop_waiting_frames_) {
+ QUIC_RELOADABLE_FLAG_COUNT(quic_simplify_stop_waiting);
+ send_stop_waiting = false;
+ }
PostProcessAfterAckFrame(send_stop_waiting,
ack_result == PACKETS_NEWLY_ACKED);
processing_ack_frame_ = false;
