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

Unified Diff: net/quic/test_tools/quic_test_packet_maker.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/test_tools/quic_stream_sequencer_peer.cc ('k') | net/quic/test_tools/quic_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/quic_test_packet_maker.cc
diff --git a/net/quic/test_tools/quic_test_packet_maker.cc b/net/quic/test_tools/quic_test_packet_maker.cc
index d00aedfadbef8ee9a5539b18c590196c4df8f837..4cbbc1f2ba8f074febf2af53494e62b46c19da02 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -13,7 +13,6 @@
#include "net/quic/core/quic_utils.h"
#include "net/quic/test_tools/quic_test_utils.h"
-using std::make_pair;
namespace net {
namespace test {
@@ -96,7 +95,7 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
QuicAckFrame ack(MakeAckFrame(largest_received));
ack.ack_delay_time = QuicTime::Delta::Zero();
for (QuicPacketNumber i = ack_least_unacked; i <= largest_received; ++i) {
- ack.received_packet_times.push_back(make_pair(i, clock_->Now()));
+ ack.received_packet_times.push_back(std::make_pair(i, clock_->Now()));
}
if (largest_received > 0) {
ack.packets.Add(1, largest_received + 1);
@@ -145,7 +144,7 @@ QuicTestPacketMaker::MakeAckAndConnectionClosePacket(
QuicAckFrame ack(MakeAckFrame(largest_received));
ack.ack_delay_time = ack_delay_time;
for (QuicPacketNumber i = least_unacked; i <= largest_received; ++i) {
- ack.received_packet_times.push_back(make_pair(i, clock_->Now()));
+ ack.received_packet_times.push_back(std::make_pair(i, clock_->Now()));
}
if (largest_received > 0) {
ack.packets.Add(1, largest_received + 1);
@@ -240,7 +239,7 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckPacket(
QuicAckFrame ack(MakeAckFrame(largest_received));
ack.ack_delay_time = QuicTime::Delta::Zero();
for (QuicPacketNumber i = ack_least_unacked; i <= largest_received; ++i) {
- ack.received_packet_times.push_back(make_pair(i, clock_->Now()));
+ ack.received_packet_times.push_back(std::make_pair(i, clock_->Now()));
}
if (largest_received > 0) {
ack.packets.Add(1, largest_received + 1);
@@ -322,7 +321,7 @@ std::unique_ptr<QuicReceivedPacket> QuicTestPacketMaker::MakeAckAndDataPacket(
QuicAckFrame ack(MakeAckFrame(largest_received));
ack.ack_delay_time = QuicTime::Delta::Zero();
for (QuicPacketNumber i = least_unacked; i <= largest_received; ++i) {
- ack.received_packet_times.push_back(make_pair(i, clock_->Now()));
+ ack.received_packet_times.push_back(std::make_pair(i, clock_->Now()));
}
if (largest_received > 0) {
ack.packets.Add(1, largest_received + 1);
« no previous file with comments | « net/quic/test_tools/quic_stream_sequencer_peer.cc ('k') | net/quic/test_tools/quic_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698