Update from https://crrev.com/316786

net/quic/quic_received_packet_manager.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 <limits>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/quic_connection_stats.h"
 
-using std::make_pair;
 using std::max;
 using std::min;
 using std::numeric_limits;
 
 namespace net {
 
 namespace {
 
 // The maximum number of packets to ack immediately after a missing packet for
 // fast retransmission to kick in at the sender.  This limit is created to
@@ skipping 47 matching lines @@
 
   // Optimize the typical case of no gaps.
   if (sequence_number == largest_observed_ + 1 && packets_entropy_.empty()) {
     ++first_gap_;
     largest_observed_ = sequence_number;
     return;
   }
   if (sequence_number > largest_observed_) {
     for (QuicPacketSequenceNumber i = 0;
          i < (sequence_number - largest_observed_ - 1); ++i) {
-      packets_entropy_.push_back(make_pair(0, false));
+      packets_entropy_.push_back(std::make_pair(0, false));
     }
-    packets_entropy_.push_back(make_pair(entropy_hash, true));
+    packets_entropy_.push_back(std::make_pair(entropy_hash, true));
     largest_observed_ = sequence_number;
   } else {
     packets_entropy_[sequence_number - first_gap_] =
-        make_pair(entropy_hash, true);
+        std::make_pair(entropy_hash, true);
     AdvanceFirstGapAndGarbageCollectEntropyMap();
   }
 
   DVLOG(2) << "setting cumulative received entropy hash to: "
            << static_cast<int>(packets_entropy_hash_)
            << " updated with sequence number " << sequence_number
            << " entropy hash: " << static_cast<int>(entropy_hash);
 }
 
 void QuicReceivedPacketManager::EntropyTracker::SetCumulativeEntropyUpTo(
@@ skipping 27 matching lines @@
 AdvanceFirstGapAndGarbageCollectEntropyMap() {
   while (!packets_entropy_.empty() && packets_entropy_.front().second) {
     ++first_gap_;
     packets_entropy_.pop_front();
   }
 }
 
 QuicReceivedPacketManager::QuicReceivedPacketManager(QuicConnectionStats* stats)
     : peer_least_packet_awaiting_ack_(0),
       time_largest_observed_(QuicTime::Zero()),
-      receive_algorithm_(ReceiveAlgorithmInterface::Create()),
       stats_(stats) {
   ack_frame_.largest_observed = 0;
   ack_frame_.entropy_hash = 0;
 }
 
 QuicReceivedPacketManager::~QuicReceivedPacketManager() {}
 
 void QuicReceivedPacketManager::RecordPacketReceived(
     QuicByteCount bytes,
     const QuicPacketHeader& header,
@@ skipping 22 matching lines @@
     stats_->max_time_reordering_us = max(stats_->max_time_reordering_us,
                                          reordering_time_us);
   }
   if (sequence_number > ack_frame_.largest_observed) {
     ack_frame_.largest_observed = sequence_number;
     time_largest_observed_ = receipt_time;
   }
   entropy_tracker_.RecordPacketEntropyHash(sequence_number,
                                            header.entropy_hash);
 
-  receive_algorithm_->RecordIncomingPacket(
-      bytes, sequence_number, receipt_time);
-
   received_packet_times_.push_back(
       std::make_pair(sequence_number, receipt_time));
 
   ack_frame_.revived_packets.erase(sequence_number);
 }
 
 void QuicReceivedPacketManager::RecordPacketRevived(
     QuicPacketSequenceNumber sequence_number) {
   LOG_IF(DFATAL, !IsAwaitingPacket(sequence_number));
   ack_frame_.revived_packets.insert(sequence_number);
@@ skipping 36 matching lines @@
 
   // Ensure the delta is zero if approximate now is "in the past".
   ack_frame->delta_time_largest_observed =
       approximate_now < time_largest_observed_ ?
           QuicTime::Delta::Zero() :
           approximate_now.Subtract(time_largest_observed_);
 
   // Remove all packets that are too far from largest_observed to express.
   received_packet_times_.remove_if(isTooLarge(ack_frame_.largest_observed));
 
-  ack_frame->received_packet_times = received_packet_times_;
-  received_packet_times_.clear();
+  ack_frame->received_packet_times.clear();
+  ack_frame->received_packet_times.swap(received_packet_times_);
 }
 
 QuicPacketEntropyHash QuicReceivedPacketManager::EntropyHash(
     QuicPacketSequenceNumber sequence_number) const {
   return entropy_tracker_.EntropyHash(sequence_number);
 }
 
 bool QuicReceivedPacketManager::DontWaitForPacketsBefore(
     QuicPacketSequenceNumber least_unacked) {
   ack_frame_.revived_packets.erase(
@@ skipping 30 matching lines @@
   return !ack_frame_.missing_packets.empty() &&
       (ack_frame_.largest_observed -
        *ack_frame_.missing_packets.rbegin()) <= kMaxPacketsAfterNewMissing;
 }
 
 size_t QuicReceivedPacketManager::NumTrackedPackets() const {
   return entropy_tracker_.size();
 }
 
 }  // namespace net