Landing Recent QUIC changes until 01/26/2016 18:14 UTC

net/quic/test_tools/quic_sent_packet_manager_peer.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/test_tools/quic_sent_packet_manager_peer.h"
 
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/loss_detection_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_flags.h"
@@ skipping 88 matching lines @@
   return sent_packet_manager->unacked_packets_.GetTransmissionInfo(
                                                   packet_number)
       .sent_time;
 }
 
 // static
 bool QuicSentPacketManagerPeer::IsRetransmission(
     QuicSentPacketManager* sent_packet_manager,
     QuicPacketNumber packet_number) {
   DCHECK(sent_packet_manager->HasRetransmittableFrames(packet_number));
-  if (FLAGS_quic_track_single_retransmission) {
-    if (!sent_packet_manager->HasRetransmittableFrames(packet_number)) {
-      return false;
-    }
-    for (auto transmission_info : sent_packet_manager->unacked_packets_) {
-      if (transmission_info.retransmission == packet_number) {
-        return true;
-      }
-    }
+  if (!sent_packet_manager->HasRetransmittableFrames(packet_number)) {
     return false;
   }
-  return sent_packet_manager->HasRetransmittableFrames(packet_number) &&
-         sent_packet_manager->unacked_packets_.GetTransmissionInfo(
-                                                  packet_number)
-                 .all_transmissions != nullptr;
+  for (auto transmission_info : sent_packet_manager->unacked_packets_) {
+    if (transmission_info.retransmission == packet_number) {
+      return true;
+    }
+  }
+  return false;
 }
 
 // static
 void QuicSentPacketManagerPeer::MarkForRetransmission(
     QuicSentPacketManager* sent_packet_manager,
     QuicPacketNumber packet_number,
     TransmissionType transmission_type) {
   sent_packet_manager->MarkForRetransmission(packet_number, transmission_type);
 }
 
@@ skipping 37 matching lines @@
 }
 
 // static
 QuicSustainedBandwidthRecorder& QuicSentPacketManagerPeer::GetBandwidthRecorder(
     QuicSentPacketManager* sent_packet_manager) {
   return sent_packet_manager->sustained_bandwidth_recorder_;
 }
 
 }  // namespace test
 }  // namespace net