| Index: net/quic/test_tools/quic_test_utils.cc
|
| diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
|
| index 795a3a7931323e878b2e89a50b010120160321d5..46babc7326d4a1e3713097fd0c4a13deec924aa4 100644
|
| --- a/net/quic/test_tools/quic_test_utils.cc
|
| +++ b/net/quic/test_tools/quic_test_utils.cc
|
| @@ -25,8 +25,6 @@
|
| #include "net/tools/quic/quic_per_connection_packet_writer.h"
|
|
|
| using base::StringPiece;
|
| -using std::max;
|
| -using std::min;
|
| using std::string;
|
| using testing::Invoke;
|
| using testing::_;
|
| @@ -504,8 +502,8 @@ string HexDumpWithMarks(const char* data,
|
| const int kSizeLimit = 1024;
|
| if (length > kSizeLimit || mark_length > kSizeLimit) {
|
| LOG(ERROR) << "Only dumping first " << kSizeLimit << " bytes.";
|
| - length = min(length, kSizeLimit);
|
| - mark_length = min(mark_length, kSizeLimit);
|
| + length = std::min(length, kSizeLimit);
|
| + mark_length = std::min(mark_length, kSizeLimit);
|
| }
|
|
|
| string hex;
|
| @@ -711,8 +709,8 @@ void CompareCharArraysWithHexError(const string& description,
|
| const char* expected,
|
| const int expected_len) {
|
| EXPECT_EQ(actual_len, expected_len);
|
| - const int min_len = min(actual_len, expected_len);
|
| - const int max_len = max(actual_len, expected_len);
|
| + const int min_len = std::min(actual_len, expected_len);
|
| + const int max_len = std::max(actual_len, expected_len);
|
| std::unique_ptr<bool[]> marks(new bool[max_len]);
|
| bool identical = (actual_len == expected_len);
|
| for (int i = 0; i < min_len; ++i) {
|
|
|