Landing Recent QUIC Changes.

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_protocol.h"
@@ skipping 71 matching lines @@
       sequence_number).sent_time;
 }
 
 // static
 bool QuicSentPacketManagerPeer::IsRetransmission(
     QuicSentPacketManager* sent_packet_manager,
     QuicPacketSequenceNumber sequence_number) {
   DCHECK(sent_packet_manager->HasRetransmittableFrames(sequence_number));
   return sent_packet_manager->HasRetransmittableFrames(sequence_number) &&
       sent_packet_manager->unacked_packets_.GetTransmissionInfo(
-          sequence_number).all_transmissions->size() > 1;
+          sequence_number).all_transmissions != NULL;
 }
 
 // static
 void QuicSentPacketManagerPeer::MarkForRetransmission(
     QuicSentPacketManager* sent_packet_manager,
     QuicPacketSequenceNumber sequence_number,
     TransmissionType transmission_type) {
   sent_packet_manager->MarkForRetransmission(sequence_number,
                                              transmission_type);
 }
@@ skipping 10 matching lines @@
   return sent_packet_manager->unacked_packets_.HasPendingCryptoPackets();
 }
 
 // static
 size_t QuicSentPacketManagerPeer::GetNumRetransmittablePackets(
     const QuicSentPacketManager* sent_packet_manager) {
   size_t num_unacked_packets = 0;
   for (QuicUnackedPacketMap::const_iterator it =
            sent_packet_manager->unacked_packets_.begin();
        it != sent_packet_manager->unacked_packets_.end(); ++it) {
-    if (it->second.retransmittable_frames != NULL) {
+    if (it->retransmittable_frames != NULL) {
       ++num_unacked_packets;
     }
   }
   return num_unacked_packets;
 }
 
 // static
 QuicByteCount QuicSentPacketManagerPeer::GetBytesInFlight(
     const QuicSentPacketManager* sent_packet_manager) {
   return sent_packet_manager->unacked_packets_.bytes_in_flight();
 }
 
 // static
 QuicSentPacketManager::NetworkChangeVisitor*
     QuicSentPacketManagerPeer::GetNetworkChangeVisitor(
         const QuicSentPacketManager* sent_packet_manager) {
   return sent_packet_manager->network_change_visitor_;
 }
 
 // static
 QuicSustainedBandwidthRecorder& QuicSentPacketManagerPeer::GetBandwidthRecorder(
     QuicSentPacketManager* sent_packet_manager) {
   return sent_packet_manager->sustained_bandwidth_recorder_;
 }
 
 }  // namespace test
 }  // namespace net