Various QUIC cleanups to sync with internal code.

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;
+
 namespace net {
 
 // Note(pwestin): the magic clamping numbers come from the original code in
 // tcp_cubic.c.
 // Number of delay samples for detecting the increase of delay.
 const int kHybridStartMinSamples = 8;
 const int kHybridStartDelayFactorExp = 4;  // 2^4 = 16
 const int kHybridStartDelayMinThresholdUs = 2000;
 const int kHybridStartDelayMaxThresholdUs = 16000;
 
@@ skipping 60 matching lines @@
   sample_count_++;
   if (sample_count_ <= kHybridStartMinSamples) {
     if (current_rtt_.IsZero() || current_rtt_ > rtt) {
       current_rtt_ = rtt;
     }
   }
   // We only need to check this once.
   if (sample_count_ == kHybridStartMinSamples) {
     int accepted_variance_us = delay_min.ToMicroseconds() >>
         kHybridStartDelayFactorExp;
-    accepted_variance_us = std::min(accepted_variance_us,
-                                    kHybridStartDelayMaxThresholdUs);
+    accepted_variance_us = min(accepted_variance_us,
+                               kHybridStartDelayMaxThresholdUs);
     QuicTime::Delta accepted_variance = QuicTime::Delta::FromMicroseconds(
-        std::max(accepted_variance_us, kHybridStartDelayMinThresholdUs));
+        max(accepted_variance_us, kHybridStartDelayMinThresholdUs));
 
     if (current_rtt_ > delay_min.Add(accepted_variance)) {
       found_delay_ = true;
     }
   }
 }
 
 bool HybridSlowStart::Exit() {
   // If either one of the two conditions are met we exit from slow start
   // immediately.
   if (found_ack_train_ || found_delay_) {
     return true;
   }
   return false;
 }
 
 }  // namespace net