commit 5d39333768b9f11c2bdc3fd39bf89a6962b6fa7c
author fayang <fayang@google.com> Mon Apr 18 13:34:54 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 18 13:36:02 2022 -0700
tree b237987dd07cfc5f977f9757a8661e5675e0ba2f
parent bdf2818a7c4b9dc7d277ab3878711938428aa64f

In QuicConnection, rename ping_timeout_ to keep_alive_ping_timeout_. Remove two getters ping_timeout() and initial_retransmittable_on_wire_timeout().

For chromium merge:
1) please replace ping_timeout() with quic::QuicTime::Delta::FromSeconds(quic::kPingTimeoutSecs),
2) please remove the spot using initial_retransmittable_on_wire_timeout(): https://source.chromium.org/chromium/chromium/src/+/main:net/quic/quic_chromium_client_session_test.cc;drc=d138bd5bee710c5d3befd0c08f1949b99a837e06;l=2307

PiperOrigin-RevId: 442619172

quiche/quic/core/quic_connection_test.cc

diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 2770f5a..522c78e 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -5043,7 +5043,7 @@
   EXPECT_FALSE(connection_.GetPingAlarm()->IsSet());
 
   // Use a reduced ping timeout for this connection.
-  connection_.set_ping_timeout(QuicTime::Delta::FromSeconds(10));
+  connection_.set_keep_alive_ping_timeout(QuicTime::Delta::FromSeconds(10));
 
   // Advance to 5ms, and send a packet to the peer, which will set
   // the ping alarm.
@@ -8431,7 +8431,7 @@
   // The ping alarm is set for the ping timeout, not the shorter
   // retransmittable_on_wire_timeout.
   EXPECT_TRUE(connection_.GetPingAlarm()->IsSet());
-  EXPECT_EQ(connection_.ping_timeout(),
+  EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
             connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
 
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)).Times(AnyNumber());
@@ -8462,7 +8462,8 @@
 
   // Verify subsequent pings are sent with timeout that is exponentially backed
   // off.
-  while (retransmittable_on_wire_timeout * 2 < connection_.ping_timeout()) {
+  while (retransmittable_on_wire_timeout * 2 <
+         QuicTime::Delta::FromSeconds(kPingTimeoutSecs)) {
     // Receive an ACK for the previous PING. This should set the
     // ping alarm with backed off retransmittable-on-wire timeout.
     retransmittable_on_wire_timeout = retransmittable_on_wire_timeout * 2;
@@ -8483,7 +8484,7 @@
 
   // The ping alarm is set with default ping timeout.
   EXPECT_TRUE(connection_.GetPingAlarm()->IsSet());
-  EXPECT_EQ(connection_.ping_timeout(),
+  EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
             connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
 
   // Receive an ACK for the previous PING. The ping alarm is set with an
@@ -8494,7 +8495,8 @@
       {{QuicPacketNumber(ack_num), QuicPacketNumber(ack_num + 1)}});
   ProcessAckPacket(&frame);
   EXPECT_TRUE(connection_.GetPingAlarm()->IsSet());
-  EXPECT_EQ(connection_.ping_timeout() - QuicTime::Delta::FromMilliseconds(5),
+  EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs) -
+                QuicTime::Delta::FromMilliseconds(5),
             connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
 }
 
@@ -8526,7 +8528,7 @@
   // The ping alarm is set for the ping timeout, not the shorter
   // retransmittable_on_wire_timeout.
   EXPECT_TRUE(connection_.GetPingAlarm()->IsSet());
-  EXPECT_EQ(connection_.ping_timeout(),
+  EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
             connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
 
   // Receive an ACK of the first packet. This should set the ping alarm with
@@ -8640,7 +8642,7 @@
   // The ping alarm is set for the ping timeout, not the shorter
   // retransmittable_on_wire_timeout.
   EXPECT_TRUE(connection_.GetPingAlarm()->IsSet());
-  EXPECT_EQ(connection_.ping_timeout(),
+  EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
             connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
 
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)).Times(AnyNumber());
@@ -8673,7 +8675,7 @@
       {{QuicPacketNumber(ack_num), QuicPacketNumber(ack_num + 1)}});
   ProcessAckPacket(&frame);
   EXPECT_TRUE(connection_.GetPingAlarm()->IsSet());
-  EXPECT_EQ(connection_.ping_timeout(),
+  EXPECT_EQ(QuicTime::Delta::FromSeconds(kPingTimeoutSecs),
             connection_.GetPingAlarm()->deadline() - clock_.ApproximateNow());
 }