Landing Recent QUIC changes until 7/26/2016 13:53 UTC

net/quic/quic_sent_packet_manager.cc

Index: net/quic/quic_sent_packet_manager.cc
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index bbe15688bbc8f8c7397eb4ab7f0b535a7b622ac0..0ff46ac784dc941603be45ae1864c8d7b6c38f69 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -754,8 +754,12 @@ bool QuicSentPacketManager::MaybeUpdateRTT(const QuicAckFrame& ack_frame,
       send_delta.ToSeconds() > kMaxSendDeltaSeconds) {
     // send_delta can be very high if local clock is changed mid-connection.
     LOG(WARNING) << "Excessive send delta: " << send_delta.ToSeconds()
-                 << ", setting to: " << kMaxSendDeltaSeconds;
-    send_delta = QuicTime::Delta::FromSeconds(kMaxSendDeltaSeconds);
+                 << ", setting to: " << kMaxSendDeltaSeconds
+                 << " largest_observed:" << ack_frame.largest_observed
+                 << " ack_receive_time:" << ack_receive_time.ToDebuggingValue()
+                 << " sent_time:"
+                 << transmission_info.sent_time.ToDebuggingValue();
+    return false;
   }
   rtt_stats_.UpdateRtt(send_delta, ack_frame.ack_delay_time, ack_receive_time);