QUIC - Minor cleanup changes to match the internal source code.

net/quic/congestion_control/paced_sender.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/paced_sender.h"
 
 #include <algorithm>
 
 #include "net/quic/quic_protocol.h"
 
+using std::max;
+
 namespace net {
 
 // To prevent too aggressive pacing we allow the following packet burst size.
 const int64 kMinPacketBurstSize = 2;
 // Max estimated time between calls to TimeUntilSend and
 // AvailableCongestionWindow.
 const int64 kMaxSchedulingDelayUs = 2000;
 
 PacedSender::PacedSender(QuicBandwidth estimate, QuicByteCount max_segment_size)
     : leaky_bucket_(estimate),
@@ skipping 13 matching lines @@
 
 QuicTime::Delta PacedSender::TimeUntilSend(QuicTime now,
                                            QuicTime::Delta time_until_send) {
   if (time_until_send.ToMicroseconds() >= kMaxSchedulingDelayUs) {
     return time_until_send;
   }
   // Pace the data.
   QuicByteCount pacing_window = pace_.ToBytesPerPeriod(
       QuicTime::Delta::FromMicroseconds(kMaxSchedulingDelayUs));
   QuicByteCount min_window_size = kMinPacketBurstSize *  max_segment_size_;
-  pacing_window = std::max(pacing_window, min_window_size);
+  pacing_window = max(pacing_window, min_window_size);
 
   if (pacing_window > leaky_bucket_.BytesPending(now)) {
     // We have not filled our pacing window yet.
     return time_until_send;
   }
   return leaky_bucket_.TimeRemaining(now);
 }
 
 }  // namespace net