Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/congestion_control/hybrid_slow_start.cc

 // Copyright (c) 2012 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/hybrid_slow_start.h"
 
 #include <algorithm>
 
 using std::max;
 using std::min;
@@ skipping 76 matching lines @@
     // Divide min_rtt by 8 to get a rtt increase threshold for exiting.
     int64_t min_rtt_increase_threshold_us =
         min_rtt.ToMicroseconds() >> kHybridStartDelayFactorExp;
     // Ensure the rtt threshold is never less than 2ms or more than 16ms.
     min_rtt_increase_threshold_us =
         min(min_rtt_increase_threshold_us, kHybridStartDelayMaxThresholdUs);
     QuicTime::Delta min_rtt_increase_threshold =
         QuicTime::Delta::FromMicroseconds(max(min_rtt_increase_threshold_us,
                                               kHybridStartDelayMinThresholdUs));
 
-    if (current_min_rtt_ > min_rtt.Add(min_rtt_increase_threshold)) {
+    if (current_min_rtt_ > min_rtt + min_rtt_increase_threshold) {
       hystart_found_ = DELAY;
     }
   }
   // Exit from slow start if the cwnd is greater than 16 and
   // increasing delay is found.
   return congestion_window >= kHybridStartLowWindow &&
          hystart_found_ != NOT_FOUND;
 }
 
 }  // namespace net