Landing Recent QUIC changes until 4/22/2016 14:55 UTC

net/quic/quic_sent_packet_manager.cc

Index: net/quic/quic_sent_packet_manager.cc
diff --git a/net/quic/quic_sent_packet_manager.cc b/net/quic/quic_sent_packet_manager.cc
index bed16fe8e7a4de13cc2d6d716a37abf9b6689afe..1dc40bfcd5fb9a2634e36065da0f9e1653c230ab 100644
--- a/net/quic/quic_sent_packet_manager.cc
+++ b/net/quic/quic_sent_packet_manager.cc
@@ -295,7 +295,7 @@ void QuicSentPacketManager::HandleAckForSentPackets(
 
     if (ack_frame.missing_packets.Contains(packet_number)) {
       // Don't continue to increase the nack count for packets not in flight.
-      if (!it->in_flight) {
+      if (FLAGS_quic_simplify_loss_detection || !it->in_flight) {
         continue;
       }
       // Consider it multiple nacks when there is a gap between the missing
@@ -440,7 +440,7 @@ PendingRetransmission QuicSentPacketManager::NextPendingRetransmission() {
   return PendingRetransmission(path_id_, packet_number, transmission_type,
                                transmission_info.retransmittable_frames,
                                transmission_info.has_crypto_handshake,
-                               transmission_info.needs_padding,
+                               transmission_info.num_padding_bytes,
                                transmission_info.encryption_level,
                                transmission_info.packet_number_length);
 }