| Index: net/quic/core/congestion_control/pacing_sender.cc
|
| diff --git a/net/quic/core/congestion_control/pacing_sender.cc b/net/quic/core/congestion_control/pacing_sender.cc
|
| index 8ce6e8ae962e1765db84573ee33fd57fd4026c37..5cac490f9c7009959df612d38559ca8d08671afd 100644
|
| --- a/net/quic/core/congestion_control/pacing_sender.cc
|
| +++ b/net/quic/core/congestion_control/pacing_sender.cc
|
| @@ -8,7 +8,6 @@
|
|
|
| #include "net/quic/core/quic_flags.h"
|
|
|
| -using std::min;
|
|
|
| namespace net {
|
| namespace {
|
| @@ -71,7 +70,7 @@ bool PacingSender::OnPacketSent(
|
| // Add more burst tokens anytime the connection is leaving quiescence, but
|
| // limit it to the equivalent of a single bulk write, not exceeding the
|
| // current CWND in packets.
|
| - burst_tokens_ = min(
|
| + burst_tokens_ = std::min(
|
| kInitialUnpacedBurst,
|
| static_cast<uint32_t>(sender_->GetCongestionWindow() / kDefaultTCPMSS));
|
| }
|
| @@ -146,8 +145,8 @@ QuicBandwidth PacingSender::PacingRate(QuicByteCount bytes_in_flight) const {
|
| DCHECK(sender_ != nullptr);
|
| if (!max_pacing_rate_.IsZero()) {
|
| return QuicBandwidth::FromBitsPerSecond(
|
| - min(max_pacing_rate_.ToBitsPerSecond(),
|
| - sender_->PacingRate(bytes_in_flight).ToBitsPerSecond()));
|
| + std::min(max_pacing_rate_.ToBitsPerSecond(),
|
| + sender_->PacingRate(bytes_in_flight).ToBitsPerSecond()));
|
| }
|
| return sender_->PacingRate(bytes_in_flight);
|
| }
|
|
|