Land Recent QUIC Changes.

net/quic/congestion_control/rtt_stats.cc

Index: net/quic/congestion_control/rtt_stats.cc
diff --git a/net/quic/congestion_control/rtt_stats.cc b/net/quic/congestion_control/rtt_stats.cc
index 745deb58cb3d085cbfed94d73585e6f42d5c577a..3225d9f3afc2b0817d23623773ae1aa8e2b93c11 100644
--- a/net/quic/congestion_control/rtt_stats.cc
+++ b/net/quic/congestion_control/rtt_stats.cc
@@ -4,6 +4,8 @@
 
 #include "net/quic/congestion_control/rtt_stats.h"
 
+using std::max;
+
 namespace net {
 
 namespace {
@@ -37,6 +39,11 @@ void RttStats::SampleNewRecentMinRtt(uint32 num_samples) {
   new_min_rtt_ = RttSample();
 }
 
+void RttStats::ExpireSmoothedMetrics() {
+  mean_deviation_ = max(mean_deviation_, latest_rtt_.Subtract(smoothed_rtt_));
+  smoothed_rtt_ = max(smoothed_rtt_, latest_rtt_);
+}
+
 // Updates the RTT based on a new sample.
 void RttStats::UpdateRtt(QuicTime::Delta send_delta,
                          QuicTime::Delta ack_delay,