Fix a QUIC bug where a crypto packet was never removed from the

net/quic/quic_sent_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_sent_packet_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 243 matching lines @@
   for (QuicUnackedPacketMap::const_iterator it = unacked_packets_.begin();
        it != unacked_packets_.end(); ++it) {
     const RetransmittableFrames* frames =
         it->second.retransmittable_frames;
     if (frames != NULL && frames->encryption_level() == ENCRYPTION_NONE) {
       // Once you're forward secure, no unencrypted packets will be sent, crypto
       // or otherwise. Unencrypted packets are neutered and abandoned, to ensure
       // they are not retransmitted or considered lost from a congestion control
       // perspective.
       pending_retransmissions_.erase(it->first);
-      unacked_packets_.NeuterPacket(it->first);
       unacked_packets_.SetNotPending(it->first);
+      // TODO(ianswett): Clean this up so UnackedPacketMap maintains the correct
+      // invariants between the various transmissions for NeuterPacket.
+      SequenceNumberSet all_transmissions = *it->second.all_transmissions;
+      for (SequenceNumberSet::const_iterator all_it = all_transmissions.begin();
+           all_it != all_transmissions.end(); ++all_it) {
+        unacked_packets_.NeuterPacket(*all_it);
+      }
     }
   }
 }
 
 void QuicSentPacketManager::MarkForRetransmission(
     QuicPacketSequenceNumber sequence_number,
     TransmissionType transmission_type) {
   const TransmissionInfo& transmission_info =
       unacked_packets_.GetTransmissionInfo(sequence_number);
   LOG_IF(DFATAL, transmission_info.retransmittable_frames == NULL);
@@ skipping 488 matching lines @@
     return;
   }
 
   using_pacing_ = true;
   send_algorithm_.reset(
       new PacingSender(send_algorithm_.release(),
                        QuicTime::Delta::FromMicroseconds(1)));
 }
 
 }  // namespace net