Deprecate gfe2_reloadable_flag_quic_cap_large_client_initial_rtt. PiperOrigin-RevId: 339298563 Change-Id: Ic672f9d4079ec7f71cba22bc269d7762a2ad7466
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc index 6d579f5..0557b2b 100644 --- a/quic/core/http/end_to_end_test.cc +++ b/quic/core/http/end_to_end_test.cc
@@ -2245,17 +2245,10 @@ client_sent_packet_manager->GetRttStats()->smoothed_rtt().IsInfinite()); const RttStats* server_rtt_stats = server_sent_packet_manager->GetRttStats(); - if (GetQuicReloadableFlag(quic_cap_large_client_initial_rtt)) { - EXPECT_EQ(static_cast<int64_t>(1 * kNumMicrosPerSecond), - server_rtt_stats->initial_rtt().ToMicroseconds()); - EXPECT_GE(static_cast<int64_t>(1 * kNumMicrosPerSecond), - server_rtt_stats->smoothed_rtt().ToMicroseconds()); - } else { - EXPECT_EQ(static_cast<int64_t>(kMaxInitialRoundTripTimeUs), - server_rtt_stats->initial_rtt().ToMicroseconds()); - EXPECT_GE(static_cast<int64_t>(kMaxInitialRoundTripTimeUs), - server_rtt_stats->smoothed_rtt().ToMicroseconds()); - } + EXPECT_EQ(static_cast<int64_t>(kMaxInitialRoundTripTimeUs), + server_rtt_stats->initial_rtt().ToMicroseconds()); + EXPECT_GE(static_cast<int64_t>(kMaxInitialRoundTripTimeUs), + server_rtt_stats->smoothed_rtt().ToMicroseconds()); } else { ADD_FAILURE() << "Missing sent packet manager"; }
diff --git a/quic/core/quic_constants.h b/quic/core/quic_constants.h index 01ec240..62c0e77 100644 --- a/quic/core/quic_constants.h +++ b/quic/core/quic_constants.h
@@ -89,8 +89,8 @@ // Don't allow a client to suggest an RTT shorter than 10ms. const uint32_t kMinInitialRoundTripTimeUs = 10 * kNumMicrosPerMilli; -// Don't allow a client to suggest an RTT longer than 15 seconds. -const uint32_t kMaxInitialRoundTripTimeUs = 15 * kNumMicrosPerSecond; +// Don't allow a client to suggest an RTT longer than 1 second. +const uint32_t kMaxInitialRoundTripTimeUs = kNumMicrosPerSecond; // Maximum number of open streams per connection. const size_t kDefaultMaxStreamsPerConnection = 100;
diff --git a/quic/core/quic_sent_packet_manager.cc b/quic/core/quic_sent_packet_manager.cc index 01e2840..ace8d8d 100644 --- a/quic/core/quic_sent_packet_manager.cc +++ b/quic/core/quic_sent_packet_manager.cc
@@ -1575,11 +1575,6 @@ QuicTime::Delta::FromMicroseconds(kMinInitialRoundTripTimeUs); QuicTime::Delta max_rtt = QuicTime::Delta::FromMicroseconds(kMaxInitialRoundTripTimeUs); - if (GetQuicReloadableFlag(quic_cap_large_client_initial_rtt)) { - // TODO(fayang): change the value of kMaxInitialRoundTripTimeUs when - // deprecating quic_cap_large_client_initial_rtt. - max_rtt = QuicTime::Delta::FromSeconds(1); - } rtt_stats_.set_initial_rtt(std::max(min_rtt, std::min(max_rtt, rtt))); }