Landing Recent QUIC Changes.

net/quic/quic_config.cc

Index: net/quic/quic_config.cc
diff --git a/net/quic/quic_config.cc b/net/quic/quic_config.cc
index 4542a04f7477d2e84360a6a6422b84bfcc8d860a..74c0b9af8f0d050cf51e06632882d4cb4707d6df 100644
--- a/net/quic/quic_config.cc
+++ b/net/quic/quic_config.cc
@@ -552,6 +552,14 @@ uint32 QuicConfig::ReceivedInitialRoundTripTimeUs() const {
   return initial_round_trip_time_us_.GetReceivedValue();
 }
 
+bool QuicConfig::HasInitialRoundTripTimeUsToSend() const {
+  return initial_round_trip_time_us_.HasSendValue();
+}
+
+uint32 QuicConfig::GetInitialRoundTripTimeUsToSend() const {
+  return initial_round_trip_time_us_.GetSendValue();
+}
+
 void QuicConfig::SetInitialFlowControlWindowToSend(uint32 window_bytes) {
   if (window_bytes < kDefaultFlowControlSendWindow) {
     LOG(DFATAL) << "Initial flow control receive window (" << window_bytes
@@ -648,12 +656,12 @@ void QuicConfig::SetDefaults() {
   QuicTagVector congestion_feedback;
   congestion_feedback.push_back(kQBIC);
   congestion_feedback_.set(congestion_feedback, kQBIC);
-  idle_connection_state_lifetime_seconds_.set(kDefaultTimeoutSecs,
+  idle_connection_state_lifetime_seconds_.set(kMaximumIdleTimeoutSecs,
                                               kDefaultInitialTimeoutSecs);
   // kKATO is optional. Return 0 if not negotiated.
   keepalive_timeout_seconds_.set(0, 0);
-  max_streams_per_connection_.set(kDefaultMaxStreamsPerConnection,
-                                  kDefaultMaxStreamsPerConnection);
+  set_max_streams_per_connection(kDefaultMaxStreamsPerConnection,
+                                 kDefaultMaxStreamsPerConnection);
   max_time_before_crypto_handshake_ = QuicTime::Delta::FromSeconds(
       kDefaultMaxTimeForCryptoHandshakeSecs);