Deprecate gfe2_reloadable_flag_quic_fix_pto_pending_timer_count.

PiperOrigin-RevId: 346175979
Change-Id: I850cf6e934294c2d3a4390b75232c3cf014709f5

quic/core/quic_connection_test.cc

diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc
index 3988c84..d216d9d 100644
--- a/quic/core/quic_connection_test.cc
+++ b/quic/core/quic_connection_test.cc
@@ -11773,41 +11773,14 @@
 
   // Fire ACK alarm.
   connection_.GetAckAlarm()->Fire();
-  if (GetQuicReloadableFlag(quic_fix_pto_pending_timer_count)) {
-    // Verify 1-RTT packet is coalesced with handshake packet.
-    EXPECT_EQ(0x03030303u, writer_->final_bytes_of_last_packet());
-  } else {
-    // Verify handshake crypto frame is not bundled.
-    EXPECT_EQ(0x02020202u, writer_->final_bytes_of_last_packet());
-    EXPECT_FALSE(writer_->ack_frames().empty());
-    EXPECT_TRUE(writer_->crypto_frames().empty());
-  }
+  // Verify 1-RTT packet is coalesced with handshake packet.
+  EXPECT_EQ(0x03030303u, writer_->final_bytes_of_last_packet());
   connection_.GetSendAlarm()->Fire();
 
   ASSERT_TRUE(connection_.GetRetransmissionAlarm()->IsSet());
-  if (!GetQuicReloadableFlag(quic_fix_pto_pending_timer_count) &&
-      !GetQuicReloadableFlag(quic_let_connection_handle_pings)) {
-    EXPECT_CALL(visitor_, OnHandshakePacketSent()).Times(0);
-    EXPECT_CALL(visitor_, SendPing()).WillOnce(Invoke([this]() {
-      SendPing();
-    }));
-  }
   connection_.GetRetransmissionAlarm()->Fire();
-  if (GetQuicReloadableFlag(quic_fix_pto_pending_timer_count)) {
-    // Verify a handshake packet gets PTOed and 1-RTT packet gets coalesced.
-    EXPECT_EQ(0x03030303u, writer_->final_bytes_of_last_packet());
-  } else {
-    if (GetQuicReloadableFlag(quic_let_connection_handle_pings)) {
-      // Verify PING is sent in the right encryption level.
-      EXPECT_EQ(0x02020202u, writer_->final_bytes_of_last_packet());
-    } else {
-      // Verify an 1-RTT PING gets sent because there is nothing to PTO, bummer,
-      // since this 1-RTT PING cannot be processed by peer and there is a
-      // deadlock.
-      EXPECT_EQ(0x03030303u, writer_->final_bytes_of_last_packet());
-    }
-    EXPECT_FALSE(writer_->ping_frames().empty());
-  }
+  // Verify a handshake packet gets PTOed and 1-RTT packet gets coalesced.
+  EXPECT_EQ(0x03030303u, writer_->final_bytes_of_last_packet());
 }
 
 // Regression test for b/168294218.

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index d0418a2..58f3bf8 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -36,7 +36,6 @@
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_server_on_wire_ping, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_encrypted_control_frames, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_extract_x509_subject_using_certificate_view, true)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_pto_pending_timer_count, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_willing_and_able_to_write2, true)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_goaway_with_max_stream_id, false)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_granular_qpack_error_codes, true)

quic/core/quic_sent_packet_manager.cc

diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc
index d3e9a82..42786fb 100644
--- a/quic/core/quic_sent_packet_manager.cc
+++ b/quic/core/quic_sent_packet_manager.cc
@@ -1154,9 +1154,7 @@
           unacked_packets_.GetPacketNumberSpace(
               transmission_info->encryption_level) == space) {
         DCHECK(transmission_info->in_flight);
-        if (GetQuicReloadableFlag(quic_fix_pto_pending_timer_count) &&
-            pending_timer_transmission_count_ == 0) {
-          QUIC_RELOADABLE_FLAG_COUNT(quic_fix_pto_pending_timer_count);
+        if (pending_timer_transmission_count_ == 0) {
           pending_timer_transmission_count_ = 1;
         }
         MarkForRetransmission(packet_number, PTO_RETRANSMISSION);
@@ -1172,9 +1170,7 @@
           unacked_packets_.GetPacketNumberSpace(it->encryption_level) ==
               space) {
         DCHECK(it->in_flight);
-        if (GetQuicReloadableFlag(quic_fix_pto_pending_timer_count) &&
-            pending_timer_transmission_count_ == 0) {
-          QUIC_RELOADABLE_FLAG_COUNT(quic_fix_pto_pending_timer_count);
+        if (pending_timer_transmission_count_ == 0) {
           pending_timer_transmission_count_ = 1;
         }
         MarkForRetransmission(packet_number, PTO_RETRANSMISSION);