| Index: net/quic/quic_framer.cc
|
| diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
|
| index 736913f03351a47ffd679322428a69a3937d240d..4ff23a41500ac9388dd074a3c77eadbfaa8d1aea 100644
|
| --- a/net/quic/quic_framer.cc
|
| +++ b/net/quic/quic_framer.cc
|
| @@ -17,7 +17,6 @@
|
| #include "net/quic/quic_socket_address_coder.h"
|
|
|
| using base::StringPiece;
|
| -using std::make_pair;
|
| using std::map;
|
| using std::max;
|
| using std::min;
|
| @@ -1407,7 +1406,7 @@ bool QuicFramer::ProcessTimestampsInAckFrame(QuicAckFrame* ack_frame) {
|
| last_timestamp_ = CalculateTimestampFromWire(time_delta_us);
|
|
|
| ack_frame->received_packet_times.push_back(
|
| - make_pair(seq_num, creation_time_.Add(last_timestamp_)));
|
| + std::make_pair(seq_num, creation_time_.Add(last_timestamp_)));
|
|
|
| for (uint8 i = 1; i < num_received_packets; ++i) {
|
| if (!reader_->ReadBytes(&delta_from_largest_observed,
|
| @@ -1429,7 +1428,7 @@ bool QuicFramer::ProcessTimestampsInAckFrame(QuicAckFrame* ack_frame) {
|
| last_timestamp_ = last_timestamp_.Add(
|
| QuicTime::Delta::FromMicroseconds(incremental_time_delta_us));
|
| ack_frame->received_packet_times.push_back(
|
| - make_pair(seq_num, creation_time_.Add(last_timestamp_)));
|
| + std::make_pair(seq_num, creation_time_.Add(last_timestamp_)));
|
| }
|
| }
|
| }
|
|
|