Revert of Landing 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 <deque>
-
+#include "net/base/linked_hash_map.h"
 #include "net/quic/quic_protocol.h"
 
 namespace net {
 
 // Class which tracks unacked packets for three purposes:
 // 1) Track retransmittable data, including multiple transmissions of frames.
 // 2) Track packets and bytes in flight for congestion control.
 // 3) Track sent time of packets to provide RTT measurements from acks.
 class NET_EXPORT_PRIVATE QuicUnackedPacketMap {
  public:
@@ skipping 45 matching lines @@
     return largest_observed_;
   }
 
   // Returns the sum of bytes from all packets in flight.
   QuicByteCount bytes_in_flight() const {
     return bytes_in_flight_;
   }
 
   // Returns the smallest sequence number of a serialized packet which has not
   // been acked by the peer.  If there are no unacked packets, returns 0.
-  QuicPacketSequenceNumber GetLeastUnacked() const;
+  QuicPacketSequenceNumber GetLeastUnackedSentPacket() const;
 
   // 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 std::deque<TransmissionInfo> UnackedPacketMap;
+  typedef linked_hash_map<QuicPacketSequenceNumber,
+                          TransmissionInfo> UnackedPacketMap;
 
   typedef UnackedPacketMap::const_iterator const_iterator;
 
   const_iterator begin() const { return unacked_packets_.begin(); }
   const_iterator end() const { return unacked_packets_.end(); }
 
   // Returns true if there are unacked packets that are in flight.
   bool HasInFlightPackets() const;
 
   // Returns the TransmissionInfo associated with |sequence_number|, which
   // must be unacked.
   const TransmissionInfo& GetTransmissionInfo(
       QuicPacketSequenceNumber sequence_number) const;
 
   // Returns the time that the last unacked packet was sent.
   QuicTime GetLastPacketSentTime() const;
 
   // Returns the time that the first in flight packet was sent.
   QuicTime GetFirstInFlightPacketSentTime() const;
 
   // Returns the number of unacked packets.
-  size_t GetNumUnackedPacketsDebugOnly() const;
+  size_t GetNumUnackedPackets() const;
 
   // Returns true if there are multiple packets in flight.
   bool HasMultipleInFlightPackets() const;
 
   // Returns true if there are any pending crypto packets.
   bool HasPendingCryptoPackets() const;
 
   // Removes any retransmittable frames from this transmission or an associated
   // transmission.  It removes now useless transmissions, and disconnects any
   // other packets from other transmissions.
   void RemoveRetransmittability(QuicPacketSequenceNumber sequence_number);
 
   // Increases the largest observed.  Any packets less or equal to
   // |largest_acked_packet| are discarded if they are only for the RTT purposes.
   void IncreaseLargestObserved(QuicPacketSequenceNumber largest_observed);
 
-  // Remove any packets no longer needed for retransmission, congestion, or
-  // RTT measurement purposes.
-  void RemoveObsoletePackets();
-
  private:
   void MaybeRemoveRetransmittableFrames(TransmissionInfo* transmission_info);
 
   // Returns true if the packet no longer has a purpose in the map.
-  bool IsPacketUseless(QuicPacketSequenceNumber sequence_number,
-                       const TransmissionInfo& info) const;
+  bool IsPacketUseless(UnackedPacketMap::const_iterator it) const;
 
   QuicPacketSequenceNumber largest_sent_packet_;
   QuicPacketSequenceNumber largest_observed_;
 
   // Newly serialized retransmittable and fec packets are added to this map,
   // which contains owning pointers to any contained frames.  If a packet is
   // retransmitted, this map will contain entries for both the old and the new
   // packet. The old packet's retransmittable frames entry will be NULL, while
   // the new packet's entry will contain the frames to retransmit.
   // If the old packet is acked before the new packet, then the old entry will
   // be removed from the map and the new entry's retransmittable frames will be
   // set to NULL.
   UnackedPacketMap unacked_packets_;
-  // The packet at the 0th index of unacked_packets_.
-  QuicPacketSequenceNumber least_unacked_;
 
   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_