Update from https://crrev.com/316786

net/quic/quic_received_packet_manager_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_received_packet_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "net/quic/quic_connection_stats.h"
 #include "net/quic/test_tools/quic_received_packet_manager_peer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using std::make_pair;
 using std::pair;
 using std::vector;
 
 namespace net {
 namespace test {
 
 class EntropyTrackerPeer {
  public:
   static QuicPacketSequenceNumber first_gap(
       const QuicReceivedPacketManager::EntropyTracker& tracker) {
@@ skipping 181 matching lines @@
   void RecordPacketRevived(QuicPacketSequenceNumber sequence_number) {
     received_manager_.RecordPacketRevived(sequence_number);
   }
 
   QuicConnectionStats stats_;
   QuicReceivedPacketManager received_manager_;
 };
 
 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;
   for (size_t i = 1; i <= (*entropies.rbegin()).first; ++i) {
     if (entropies[index].first == i) {
       hash ^= entropies[index].second;
       ++index;
     }
     if (i < 3) continue;
     EXPECT_EQ(hash, received_manager_.EntropyHash(i));
@@ skipping 11 matching lines @@
 }
 
 TEST_F(QuicReceivedPacketManagerTest, EntropyHashAboveLargestObserved) {
   EXPECT_EQ(0, received_manager_.EntropyHash(0));
   RecordPacketReceipt(4, 5);
   EXPECT_EQ(0, received_manager_.EntropyHash(3));
 }
 
 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) {
     RecordPacketReceipt(entropies[i].first, entropies[i].second);
     entropy_hash ^= entropies[i].second;
   }
   EXPECT_EQ(entropy_hash, received_manager_.EntropyHash(7));
 
   // Now set the entropy hash up to 5 to be 100.
   entropy_hash ^= 100;
@@ skipping 82 matching lines @@
   QuicAckFrame ack;
   received_manager_.UpdateReceivedPacketInfo(&ack, QuicTime::Zero());
   EXPECT_TRUE(ack.missing_packets.empty());
   EXPECT_TRUE(ack.revived_packets.empty());
 }
 
 
 }  // namespace
 }  // namespace test
 }  // namespace net