| Index: net/quic/core/quic_session.cc
|
| diff --git a/net/quic/core/quic_session.cc b/net/quic/core/quic_session.cc
|
| index 1f98346a470b681a5e8ce1d2f7529f28c4ccc91a..ced354aaeb803c8a50cf489c862516711d86493c 100644
|
| --- a/net/quic/core/quic_session.cc
|
| +++ b/net/quic/core/quic_session.cc
|
| @@ -15,8 +15,6 @@
|
|
|
| using base::IntToString;
|
| using base::StringPiece;
|
| -using std::make_pair;
|
| -using std::max;
|
| using std::string;
|
| using net::SpdyPriority;
|
|
|
| @@ -449,16 +447,16 @@ void QuicSession::OnConfigNegotiated() {
|
| // Use a minimum number of additional streams, or a percentage increase,
|
| // whichever is larger.
|
| uint32_t max_incoming_streams =
|
| - max(max_streams + kMaxStreamsMinimumIncrement,
|
| - static_cast<uint32_t>(max_streams * kMaxStreamsMultiplier));
|
| + std::max(max_streams + kMaxStreamsMinimumIncrement,
|
| + static_cast<uint32_t>(max_streams * kMaxStreamsMultiplier));
|
| set_max_open_incoming_streams(max_incoming_streams);
|
| } else {
|
| uint32_t max_incoming_streams_to_send =
|
| config_.GetMaxIncomingDynamicStreamsToSend();
|
| uint32_t max_incoming_streams =
|
| - max(max_incoming_streams_to_send + kMaxStreamsMinimumIncrement,
|
| - static_cast<uint32_t>(max_incoming_streams_to_send *
|
| - kMaxStreamsMultiplier));
|
| + std::max(max_incoming_streams_to_send + kMaxStreamsMinimumIncrement,
|
| + static_cast<uint32_t>(max_incoming_streams_to_send *
|
| + kMaxStreamsMultiplier));
|
| set_max_open_incoming_streams(max_incoming_streams);
|
| }
|
|
|
|
|