Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: net/quic/core/quic_stream_sequencer_buffer_test.cc

Issue 2524523002: Remove various 'using std::' statements from QUIC code and use (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/quic_stream_sequencer_buffer.cc ('k') | net/quic/core/quic_stream_sequencer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_stream_sequencer_buffer_test.cc
diff --git a/net/quic/core/quic_stream_sequencer_buffer_test.cc b/net/quic/core/quic_stream_sequencer_buffer_test.cc
index 919da24517568d58e343bcb368eaa70ecab54f8f..78a11ef57395be5c0c2af5b2dfe5a6e1b332839c 100644
--- a/net/quic/core/quic_stream_sequencer_buffer_test.cc
+++ b/net/quic/core/quic_stream_sequencer_buffer_test.cc
@@ -20,7 +20,6 @@
#include "testing/gmock_mutant.h"
#include "testing/gtest/include/gtest/gtest.h"
-using std::min;
using std::string;
namespace net {
@@ -832,8 +831,8 @@ class QuicStreamSequencerBufferRandomIOTest
size_t start_chopping_offset = 0;
size_t iterations = 0;
while (start_chopping_offset < bytes_to_buffer_) {
- size_t max_chunk = min<size_t>(max_chunk_size_bytes_,
- bytes_to_buffer_ - start_chopping_offset);
+ size_t max_chunk = std::min<size_t>(
+ max_chunk_size_bytes_, bytes_to_buffer_ - start_chopping_offset);
size_t chunk_size = rng_.RandUint64() % max_chunk + 1;
chopped_stream[iterations] =
OffsetSizePair(start_chopping_offset, chunk_size);
@@ -993,7 +992,7 @@ TEST_F(QuicStreamSequencerBufferRandomIOTest, RandomWriteAndConsumeInPlace) {
size_t bytes_to_process = rng_.RandUint64() % (avail_bytes + 1);
size_t bytes_processed = 0;
for (size_t i = 0; i < actually_num_read; ++i) {
- size_t bytes_in_block = min<size_t>(
+ size_t bytes_in_block = std::min<size_t>(
bytes_to_process - bytes_processed, dest_iov[i].iov_len);
if (bytes_in_block == 0) {
break;
« no previous file with comments | « net/quic/core/quic_stream_sequencer_buffer.cc ('k') | net/quic/core/quic_stream_sequencer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698