Various QUIC cleanups to sync with internal code.

net/quic/congestion_control/inter_arrival_bitrate_ramp_up_test.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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/quic/congestion_control/inter_arrival_bitrate_ramp_up.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::min;
+
 namespace net {
 namespace test {
 
 class InterArrivalBitrateRampUpTest : public ::testing::Test {
  protected:
   InterArrivalBitrateRampUpTest()
       : one_ms_(QuicTime::Delta::FromMilliseconds(1)),
         hundred_ms_(QuicTime::Delta::FromMilliseconds(100)),
         bitrate_ramp_up_(&clock_) {
   }
@@ skipping 86 matching lines @@
   QuicBandwidth sent_bitrate = QuicBandwidth::Zero();
   bitrate_ramp_up_.Reset(start_rate,
                          available_channel_estimate,
                          channel_estimate);
 
   // First concave growth, towards available_channel_estimate.
   // Should pass without being affected by the max_sent_rate.
   for (int i = 0; i < 25; ++i) {
     clock_.AdvanceTime(hundred_ms_);
     // Cap our previus sent rate.
-    sent_bitrate = std::min(sent_bitrate, max_sent_rate);
+    sent_bitrate = min(sent_bitrate, max_sent_rate);
     sent_bitrate = bitrate_ramp_up_.GetNewBitrate(sent_bitrate);
     EXPECT_GE(available_channel_estimate, sent_bitrate);
     EXPECT_LE(start_rate, sent_bitrate);
   }
   clock_.AdvanceTime(hundred_ms_);
   // Cap our previus sent rate.
-  sent_bitrate = std::min(sent_bitrate, max_sent_rate);
+  sent_bitrate = min(sent_bitrate, max_sent_rate);
   sent_bitrate = bitrate_ramp_up_.GetNewBitrate(sent_bitrate);
   EXPECT_LE(available_channel_estimate, sent_bitrate);
 
   // First convex growth, from available_channel_estimate.
   for (int j = 0; j < 25; ++j) {
     clock_.AdvanceTime(hundred_ms_);
     // Cap our previus sent rate.
-    sent_bitrate = std::min(sent_bitrate, max_sent_rate);
+    sent_bitrate = min(sent_bitrate, max_sent_rate);
     sent_bitrate = bitrate_ramp_up_.GetNewBitrate(sent_bitrate);
     EXPECT_LE(available_channel_estimate, sent_bitrate);
     EXPECT_GE(halfway_point, sent_bitrate);
   }
   clock_.AdvanceTime(hundred_ms_);
-  sent_bitrate = std::min(sent_bitrate, max_sent_rate);
+  sent_bitrate = min(sent_bitrate, max_sent_rate);
   sent_bitrate = bitrate_ramp_up_.GetNewBitrate(sent_bitrate);
   // We expect 2 * sent_bitrate to cap the rate.
   EXPECT_LE(max_sent_rate.Add(max_sent_rate), sent_bitrate);
   // Remove our sent cap.
   // Expect bitrate to continue to ramp from its previous rate.
   for (int j = 0; j < 5; ++j) {
     clock_.AdvanceTime(hundred_ms_);
     sent_bitrate = bitrate_ramp_up_.GetNewBitrate(sent_bitrate);
     EXPECT_LE(available_channel_estimate, sent_bitrate);
     EXPECT_LE(max_sent_rate.Add(max_sent_rate), sent_bitrate);
@@ skipping 246 matching lines @@
     EXPECT_GE(channel_estimate, sent_bitrate);
     EXPECT_LE(halfway_point, sent_bitrate);
   }
   clock_.AdvanceTime(hundred_ms_);
   sent_bitrate = bitrate_ramp_up_.GetNewBitrate(sent_bitrate);
   EXPECT_LE(channel_estimate, sent_bitrate);
 }
 
 }  // namespace test
 }  // namespace net