QUIC - minor clean up changes found while merging changes into internal

QUIC - minor clean up changes found while merging changes into internal
code base.

R=rch@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=243880

[Ryan Hamilton, 2014-01-09 01:45:18]

lgtm

[ramant (doing other things), 2014-01-09 02:22:03]

On 2014/01/09 01:45:18, Ryan Hamilton wrote:
> lgtm

You are amazing. Very fast. thanks for the quick review.

[commit-bot: I haz the power, 2014-01-09 02:22:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rtenneti@chromium.org/130003003/1

[commit-bot: I haz the power, 2014-01-09 02:22:28]

Failed to apply patch for net/quic/congestion_control/inter_arrival_probe.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file net/quic/congestion_control/inter_arrival_probe.cc
  Hunk #1 succeeded at 13 with fuzz 2 (offset 6 lines).
  Hunk #2 FAILED at 116.
  1 out of 2 hunks FAILED -- saving rejects to file
net/quic/congestion_control/inter_arrival_probe.cc.rej

Patch:       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
9f4c90cd42cd18b393cfedd14c8fc2ce302fd033..5fa8be450898ec05e85e411149a5dce2cd7c2cae
100644
--- a/net/quic/congestion_control/inter_arrival_probe.cc
+++ b/net/quic/congestion_control/inter_arrival_probe.cc
@@ -7,6 +7,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 
+using std::max;
+
 namespace {
 const int kProbeSizePackets = 10;
 const net::QuicByteCount kMinPacketSize = 500;
@@ -114,8 +116,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;

[commit-bot: I haz the power, 2014-01-09 02:55:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rtenneti@chromium.org/130003003/60001

[commit-bot: I haz the power, 2014-01-09 13:04:48]

Change committed as 243880