Update from https://crrev.com/316786

net/quic/congestion_control/send_algorithm_simulator.cc

 // Copyright 2014 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/congestion_control/send_algorithm_simulator.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "net/quic/crypto/quic_random.h"
 
 using std::list;
-using std::make_pair;
 using std::max;
 using std::min;
 using std::string;
 using std::vector;
 
 namespace net {
 
 namespace {
 
 const QuicByteCount kPacketSize = 1200;
@@ skipping 258 matching lines @@
     info.in_flight = true;
     // Find the next SentPacket for this transfer.
     while (it->transfer != transfer) {
       DCHECK(it != sent_packets_.end());
       ++it;
     }
     // If it's missing from the array, it's a loss.
     if (it->sequence_number > sender->last_acked) {
       DVLOG(1) << "Lost packet:" << sender->last_acked
                << " dropped by buffer overflow.";
-      lost_packets.push_back(make_pair(sender->last_acked, info));
+      lost_packets.push_back(std::make_pair(sender->last_acked, info));
       continue;
     }
     if (it->lost) {
-      lost_packets.push_back(make_pair(sender->last_acked, info));
+      lost_packets.push_back(std::make_pair(sender->last_acked, info));
     } else {
-      acked_packets.push_back(make_pair(sender->last_acked, info));
+      acked_packets.push_back(std::make_pair(sender->last_acked, info));
     }
     // This packet has been acked or lost, remove it from sent_packets_.
     largest_observed = *it;
     sent_packets_.erase(it++);
   }
 
   DCHECK(!largest_observed.lost);
   DVLOG(1) << "Updating RTT from send_time:"
            << largest_observed.send_time.ToDebuggingValue() << " to ack_time:"
            << largest_observed.ack_time.ToDebuggingValue();
@@ skipping 77 matching lines @@
   }
   transfer->bytes_in_flight += kPacketSize;
 }
 
 // Advance the time by |delta| without sending anything.
 void SendAlgorithmSimulator::AdvanceTime(QuicTime::Delta delta) {
   clock_->AdvanceTime(delta);
 }
 
 }  // namespace net