Prepare Chrome for merging cl/338078574

R=bnc@chromium.org

Change-Id: Ib485c7c701ec9269829806be907a070b6829eb4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2488754
Commit-Queue: David Schinazi <dschinazi@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Auto-Submit: David Schinazi <dschinazi@chromium.org>
Reviewed-by: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819207}

net/quic/quic_chromium_client_session.cc

@@ -73,12 +73,6 @@ const size_t kWaitTimeForNewNetworkSecs = 10;
 
 const size_t kMinRetryTimeForDefaultNetworkSecs = 1;
 
-// Default value for maximum number of consecutive pings that can be sent
-// with aggressive initial retransmittable on wire timeout if there is no new
-// data received. After which, the timeout will be exponentially back off until
-// exceeds the default ping timeout.
-const int kDefaultMaxAggressiveRetransmittableOnWirePingCount = 200;
-
 // Maximum RTT time for this session when set initial timeout for probing
 // network.
 const int kDefaultRTTMilliSecs = 300;
@@ -910,13 +904,6 @@ QuicChromiumClientSession::QuicChromiumClientSession(
   if (!retransmittable_on_wire_timeout.IsZero()) {
     connection->set_initial_retransmittable_on_wire_timeout(
         retransmittable_on_wire_timeout);
-    if (GetQuicFlag(
-            FLAGS_quic_max_aggressive_retransmittable_on_wire_ping_count) ==
-        0) {
-      // Set a default value for this flag if no custom value is provided.
-      SetQuicFlag(FLAGS_quic_max_aggressive_retransmittable_on_wire_ping_count,
-                  kDefaultMaxAggressiveRetransmittableOnWirePingCount);
-    }
   }
 }
 

net/quic/quic_flags_list.h

@@ -148,13 +148,18 @@ QUIC_FLAG(int32_t, FLAGS_quic_max_buffered_crypto_bytes, 16 * 1024)
 // and starts a new one.
 QUIC_FLAG(double, FLAGS_quic_ack_aggregation_bandwidth_threshold, 1.0)
 
-// If set to non-zero, the maximum number of consecutive pings that can be sent
-// with aggressive initial retransmittable on wire timeout if there is no new
-// data received. After which, the timeout will be exponentially back off until
+// Maximum number of consecutive pings that can be sent with the aggressive
+// initial retransmittable on the wire timeout if there is no new stream data
+// received. After this limit, the timeout will be doubled each ping until it
 // exceeds the default ping timeout.
 QUIC_FLAG(int32_t,
           FLAGS_quic_max_aggressive_retransmittable_on_wire_ping_count,
-          0)
+          5)
+
+// Maximum number of pings that can be sent with the retransmittable on the wire
+// timeout, over the lifetime of a connection. After this limit, the timeout
+// will be the default ping timeout.
+QUIC_FLAG(int32_t, FLAGS_quic_max_retransmittable_on_wire_ping_count, 1000)
 
 // The maximum congestion window in packets.
 QUIC_FLAG(int32_t, FLAGS_quic_max_congestion_window, 2000)