Land Recent QUIC Changes.

net/quic/congestion_control/inter_arrival_overuse_detector.cc

 // Copyright (c) 2013 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/inter_arrival_overuse_detector.h"
 
 #include <math.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ skipping 145 matching lines @@
   if (delta_overuse_counter_ > 0 &&
       accumulated_deltas_.ToMicroseconds() > kThresholdAccumulatedDeltasUs) {
     if (delta_estimate_ != kBandwidthDraining) {
       DVLOG(1) << "Bandwidth estimate drift: Draining buffer(s) "
                  << accumulated_deltas_.ToMilliseconds() << " ms";
       delta_estimate_ = kBandwidthDraining;
     }
     return;
   }
   if ((sigma_delta * kDetectTimeDiffStandardDeviation >
-          estimated_congestion_delay_.ToMicroseconds()) &&
+       estimated_congestion_delay_.ToMicroseconds()) &&
       (sigma_delta * kDetectDriftStandardDeviation >
-          abs(accumulated_deltas_.ToMicroseconds()))) {
+       std::abs(accumulated_deltas_.ToMicroseconds()))) {
     if (delta_estimate_ != kBandwidthSteady) {
       DVLOG(1) << "Bandwidth estimate drift: Steady"
                  << " mean:" << delta_mean_
                  << " sigma:" << sigma_delta
                  << " offset:" << send_receive_offset_.ToMicroseconds()
                  << " delta:" << estimated_congestion_delay_.ToMicroseconds()
                  << " drift:" << accumulated_deltas_.ToMicroseconds();
       delta_estimate_ = kBandwidthSteady;
       // Reset drift counter.
       accumulated_deltas_ = QuicTime::Delta::Zero();
@@ skipping 68 matching lines @@
       --slope_overuse_counter_;
       DVLOG(1) << "Bandwidth estimate slope: Under using"
                  << " mean:" << delta_mean_
                  << " sigma:" << sigma_delta;
       slope_estimate_ = kBandwidthUnderUsing;
     }
   }
 }
 
 }  // namespace net