Land Recent QUIC Changes.

net/quic/congestion_control/rtt_stats.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/rtt_stats.h"
 
 using std::max;
 
 namespace net {
 
@@ skipping 65 matching lines @@
   if (!HasUpdates()) {
     smoothed_rtt_ = rtt_sample;
     mean_deviation_ = QuicTime::Delta::FromMicroseconds(
         rtt_sample.ToMicroseconds() / 2);
   } else {
     mean_deviation_ = QuicTime::Delta::FromMicroseconds(
         kOneMinusBeta * mean_deviation_.ToMicroseconds() +
         kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds()));
     smoothed_rtt_ = smoothed_rtt_.Multiply(kOneMinusAlpha).Add(
         rtt_sample.Multiply(kAlpha));
-    DVLOG(1) << "Cubic; smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
+    DVLOG(1) << " smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
              << " mean_deviation(us):" << mean_deviation_.ToMicroseconds();
   }
 }
 
 void RttStats::UpdateRecentMinRtt(QuicTime::Delta rtt_sample, QuicTime now) {
   // Recent min_rtt update.
   if (num_min_rtt_samples_remaining_ > 0) {
     --num_min_rtt_samples_remaining_;
     if (new_min_rtt_.rtt.IsZero() || rtt_sample <= new_min_rtt_.rtt) {
       new_min_rtt_ = RttSample(rtt_sample, now);
@@ skipping 30 matching lines @@
 }
 
 QuicTime::Delta RttStats::SmoothedRtt() const {
   if (!HasUpdates()) {
     return QuicTime::Delta::FromMicroseconds(initial_rtt_us_);
   }
   return smoothed_rtt_;
 }
 
 }  // namespace net