Various QUIC cleanups to sync with internal code.

net/quic/congestion_control/inter_arrival_probe.cc

Index: net/quic/congestion_control/inter_arrival_probe.cc
diff --git a/net/quic/congestion_control/inter_arrival_probe.cc b/net/quic/congestion_control/inter_arrival_probe.cc
index 6d3af3208fe1151dbaa691d42d76481b4cbf0cb9..63b0db7d036dcd2114ad37d7720c928324e95f76 100644
--- a/net/quic/congestion_control/inter_arrival_probe.cc
+++ b/net/quic/congestion_control/inter_arrival_probe.cc
@@ -4,18 +4,22 @@
 
 #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),
@@ -108,8 +112,8 @@ void InterArrivalProbe::OnIncomingFeedback(
       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;