Update from https://crrev.com/316786

net/quic/quic_received_packet_manager_test.cc

Index: net/quic/quic_received_packet_manager_test.cc
diff --git a/net/quic/quic_received_packet_manager_test.cc b/net/quic/quic_received_packet_manager_test.cc
index b64025b0bc1c747ddc02c8f0c717f0f5e59560db..d91e4e0dd32736ddcb05175bb8e83f37d5b039b9 100644
--- a/net/quic/quic_received_packet_manager_test.cc
+++ b/net/quic/quic_received_packet_manager_test.cc
@@ -12,7 +12,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using std::make_pair;
 using std::pair;
 using std::vector;
 
@@ -214,17 +213,17 @@ class QuicReceivedPacketManagerTest : public ::testing::Test {
 
 TEST_F(QuicReceivedPacketManagerTest, ReceivedPacketEntropyHash) {
   vector<pair<QuicPacketSequenceNumber, QuicPacketEntropyHash> > entropies;
-  entropies.push_back(make_pair(1, 12));
-  entropies.push_back(make_pair(7, 1));
-  entropies.push_back(make_pair(2, 33));
-  entropies.push_back(make_pair(5, 3));
-  entropies.push_back(make_pair(8, 34));
+  entropies.push_back(std::make_pair(1, 12));
+  entropies.push_back(std::make_pair(7, 1));
+  entropies.push_back(std::make_pair(2, 33));
+  entropies.push_back(std::make_pair(5, 3));
+  entropies.push_back(std::make_pair(8, 34));
 
   for (size_t i = 0; i < entropies.size(); ++i) {
     RecordPacketReceipt(entropies[i].first, entropies[i].second);
   }
 
-  sort(entropies.begin(), entropies.end());
+  std::sort(entropies.begin(), entropies.end());
 
   QuicPacketEntropyHash hash = 0;
   size_t index = 0;
@@ -256,12 +255,12 @@ TEST_F(QuicReceivedPacketManagerTest, EntropyHashAboveLargestObserved) {
 
 TEST_F(QuicReceivedPacketManagerTest, SetCumulativeEntropyUpTo) {
   vector<pair<QuicPacketSequenceNumber, QuicPacketEntropyHash> > entropies;
-  entropies.push_back(make_pair(1, 12));
-  entropies.push_back(make_pair(2, 1));
-  entropies.push_back(make_pair(3, 33));
-  entropies.push_back(make_pair(4, 3));
-  entropies.push_back(make_pair(6, 34));
-  entropies.push_back(make_pair(7, 29));
+  entropies.push_back(std::make_pair(1, 12));
+  entropies.push_back(std::make_pair(2, 1));
+  entropies.push_back(std::make_pair(3, 33));
+  entropies.push_back(std::make_pair(4, 3));
+  entropies.push_back(std::make_pair(6, 34));
+  entropies.push_back(std::make_pair(7, 29));
 
   QuicPacketEntropyHash entropy_hash = 0;
   for (size_t i = 0; i < entropies.size(); ++i) {