Landing Recent QUIC Changes.

net/quic/quic_received_packet_manager.cc

Index: net/quic/quic_received_packet_manager.cc
diff --git a/net/quic/quic_received_packet_manager.cc b/net/quic/quic_received_packet_manager.cc
index 38ceec68bb466d25ef7fbe1f54cc4d07db2e76cb..f5e2c36e8838fb9a9531035cf12969d451c474ba 100644
--- a/net/quic/quic_received_packet_manager.cc
+++ b/net/quic/quic_received_packet_manager.cc
@@ -135,7 +135,6 @@ AdvanceFirstGapAndGarbageCollectEntropyMap() {
 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;
@@ -178,9 +177,6 @@ void QuicReceivedPacketManager::RecordPacketReceived(
   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));
 
@@ -237,8 +233,8 @@ void QuicReceivedPacketManager::UpdateReceivedPacketInfo(
   // 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(