Land Recent QUIC changes.

net/quic/congestion_control/inter_arrival_sender_test.cc

Index: net/quic/congestion_control/inter_arrival_sender_test.cc
diff --git a/net/quic/congestion_control/inter_arrival_sender_test.cc b/net/quic/congestion_control/inter_arrival_sender_test.cc
index 16d4fa234cfd68b050ddf5fcc46aa526bfe1fea7..c1c848bb52d4fc689ad44af69442c319014701c8 100644
--- a/net/quic/congestion_control/inter_arrival_sender_test.cc
+++ b/net/quic/congestion_control/inter_arrival_sender_test.cc
@@ -9,6 +9,8 @@
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::pair;
+
 namespace net {
 namespace test {
 
@@ -61,14 +63,14 @@ class InterArrivalSenderTest : public ::testing::Test {
     receive_clock_.AdvanceTime(spike_time);
     QuicTime receive_time = receive_clock_.ApproximateNow();
     feedback.inter_arrival.received_packet_times.insert(
-        std::pair<QuicPacketSequenceNumber, QuicTime>(
+        pair<QuicPacketSequenceNumber, QuicTime>(
             feedback_sequence_number_, receive_time));
     feedback_sequence_number_++;
 
     // We need to send feedback for 2 packets since they where sent at the
     // same time.
     feedback.inter_arrival.received_packet_times.insert(
-        std::pair<QuicPacketSequenceNumber, QuicTime>(
+        pair<QuicPacketSequenceNumber, QuicTime>(
             feedback_sequence_number_, receive_time));
     feedback_sequence_number_++;
 
@@ -90,7 +92,7 @@ class InterArrivalSenderTest : public ::testing::Test {
       }
       QuicTime receive_time = receive_clock_.ApproximateNow();
       feedback.inter_arrival.received_packet_times.insert(
-          std::pair<QuicPacketSequenceNumber, QuicTime>(
+          pair<QuicPacketSequenceNumber, QuicTime>(
               feedback_sequence_number_, receive_time));
       feedback_sequence_number_++;
     }