Land Recent QUIC Changes.

net/quic/quic_unacked_packet_map.h

 // Copyright 2014 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.
 
 #ifndef NET_QUIC_QUIC_UNACKED_PACKET_MAP_H_
 #define NET_QUIC_QUIC_UNACKED_PACKET_MAP_H_
 
 #include "net/base/linked_hash_map.h"
 #include "net/quic/quic_protocol.h"
 
@@ skipping 59 matching lines @@
 
   // Sets a packet as sent with the sent time |sent_time|.  Marks the packet
   // as in flight if |set_in_flight| is true.
   // Packets marked as in flight are expected to be marked as missing when they
   // don't arrive, indicating the need for retransmission.
   void SetSent(QuicPacketSequenceNumber sequence_number,
                QuicTime sent_time,
                QuicByteCount bytes_sent,
                bool set_in_flight);
 
+  // Restores the in flight status for a packet that was previously sent.
+  void RestoreInFlight(QuicPacketSequenceNumber sequence_number);
+
   // Clears up to |num_to_clear| previous transmissions in order to make room
   // in the ack frame for new acks.
   void ClearPreviousRetransmissions(size_t num_to_clear);
 
   typedef linked_hash_map<QuicPacketSequenceNumber,
                           TransmissionInfo> UnackedPacketMap;
 
   typedef UnackedPacketMap::const_iterator const_iterator;
 
   const_iterator begin() const { return unacked_packets_.begin(); }
@@ skipping 53 matching lines @@
   size_t bytes_in_flight_;
   // Number of retransmittable crypto handshake packets.
   size_t pending_crypto_packet_count_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicUnackedPacketMap);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_UNACKED_PACKET_MAP_H_