Deprecate gfe2_reloadable_flag_quic_fix_on_ping_timeout. PiperOrigin-RevId: 329315682 Change-Id: I5e30a88a8bc8a2b537d1a9f519632264a33367a2
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc index 2aab71f..9e0a493 100644 --- a/quic/core/quic_connection.cc +++ b/quic/core/quic_connection.cc
@@ -3134,10 +3134,7 @@ } void QuicConnection::OnPingTimeout() { - if (retransmission_alarm_->IsSet()) { - return; - } - if (GetQuicReloadableFlag(quic_fix_on_ping_timeout) && + if (retransmission_alarm_->IsSet() || !visitor_->ShouldKeepConnectionAlive()) { return; }
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index 7133bab..1cc2329 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -11760,13 +11760,8 @@ // Suppose now ShouldKeepConnectionAlive returns false. EXPECT_CALL(visitor_, ShouldKeepConnectionAlive()) .WillRepeatedly(Return(false)); - if (GetQuicReloadableFlag(quic_fix_on_ping_timeout)) { - // Verify PING does not get sent. - EXPECT_CALL(visitor_, SendPing()).Times(0); - } else { - // PING get sent even ShouldKeepConnectionAlive returns false. - EXPECT_CALL(visitor_, SendPing()).Times(1); - } + // Verify PING does not get sent. + EXPECT_CALL(visitor_, SendPing()).Times(0); connection_.GetPingAlarm()->Fire(); }