Various QUIC cleanups to sync with internal code.

net/quic/congestion_control/inter_arrival_probe.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_probe.h"
 
+#include <algorithm>
+
 #include "base/basictypes.h"
 #include "base/logging.h"
 
+using std::max;
+
+namespace net {
+
 namespace {
 const int kProbeSizePackets = 10;
-const net::QuicByteCount kMinPacketSize = 500;
+const QuicByteCount kMinPacketSize = 500;
 const int64 kDefaultBytesPerSecond = 40000;
 const float kUncertainScaleFactor = 0.5;  // TODO(pwestin): revisit this factor.
 }
 
-namespace net {
-
 InterArrivalProbe::InterArrivalProbe(QuicByteCount max_segment_size)
     : max_segment_size_(max_segment_size),
       estimate_available_(false),
       available_channel_estimate_(QuicBandwidth::Zero()),
       unacked_data_(0) {
 }
 
 InterArrivalProbe::~InterArrivalProbe() {
 }
 
@@ skipping 72 matching lines @@
       break;
     case kAvailableChannelEstimateUncertain:
       available_channel_estimate_ =
           available_channel_estimate.Scale(kUncertainScaleFactor);
       break;
     case kAvailableChannelEstimateGood:
       available_channel_estimate_ = available_channel_estimate;
       break;
     case kAvailableChannelEstimateSenderLimited:
       available_channel_estimate_ =
-          std::max(available_channel_estimate,
-                   QuicBandwidth::FromBytesPerSecond(kDefaultBytesPerSecond));
+          max(available_channel_estimate,
+              QuicBandwidth::FromBytesPerSecond(kDefaultBytesPerSecond));
       break;
   }
   estimate_available_ = true;
   available_channel_estimator_.reset(NULL);
   DVLOG(1) << "Probe estimate:"
              << available_channel_estimate_.ToKBitsPerSecond()
              << " Kbits/s";
 }
 
 }  // namespace net