| Index: net/quic/core/quic_spdy_stream_test.cc
|
| diff --git a/net/quic/core/quic_spdy_stream_test.cc b/net/quic/core/quic_spdy_stream_test.cc
|
| index 2ac223e3a3aac97029c0c5ffc45a51b2ee18372c..8a1fb6062690ae395e6b877abdd8856bc328e29d 100644
|
| --- a/net/quic/core/quic_spdy_stream_test.cc
|
| +++ b/net/quic/core/quic_spdy_stream_test.cc
|
| @@ -21,7 +21,6 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| using base::StringPiece;
|
| -using std::min;
|
| using std::string;
|
| using testing::AnyNumber;
|
| using testing::Invoke;
|
| @@ -255,7 +254,7 @@ TEST_P(QuicSpdyStreamTest, ProcessHeadersAndBodyFragments) {
|
| for (size_t offset = 0; offset < body.size(); offset += fragment_size) {
|
| size_t remaining_data = body.size() - offset;
|
| StringPiece fragment(body.data() + offset,
|
| - min(fragment_size, remaining_data));
|
| + std::min(fragment_size, remaining_data));
|
| QuicStreamFrame frame(kClientDataStreamId1, false, offset,
|
| StringPiece(fragment));
|
| stream_->OnStreamFrame(frame);
|
|
|