Land Recent QUIC Changes.

Add convenience HighestPriority and LowestPriority methods to QuicUtils

Merge internal change: 58122394
https://codereview.chromium.org/112463003/


Change QUIC to only ack every other packet when there are no losses
within the last four received packets.

Merge internal change: 58111242
https://codereview.chromium.org/113123004/


Add a version() convenience method to ReliableQuicStream.

Merge internal change: 58110960
https://codereview.chromium.org/112273003/


Fix two tests that fail when FLAGS_enable_quic_pacing is enabled

Merge internal change: 58101756
https://codereview.chromium.org/115393003/


Remove deprecated flag FLAGS_pad_quic_handshake_packets.

Merge internal change: 58101024
https://codereview.chromium.org/114923007/


Remove the is_server argument from the QuicSession constructor.
In a previous CL, I removed this from TestSession, but I missed, that
it's an argument of the main QuicSession constructor.

Merge internal change: 58059515
https://codereview.chromium.org/102313005/


Fix QUIC's TCP style retransmission logic to only send a maximum of 2
packets per incoming ack instead of 10.

Merge internal change: 58059328
https://codereview.chromium.org/109993008/


Remove redundant |is_server| argument from TestSession and call the
connection's is_server() method instead.

Merge internal change: 58047118
https://codereview.chromium.org/110373004/


Minor cleanup of QUIC MockConnection and PacketSavingConnection
constructors.

Merge internal change: 58042657
https://codereview.chromium.org/114933003/


Cleanup in QUIC to merge the previous_transmissions_map in
QuicSentPacketManager with the unacked_packets map.

Merge internal change: 58011531
https://codereview.chromium.org/109323012/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/115463002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240972 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 13 deletions

diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 9e7bdb8..71c61e9 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -204,18 +204,23 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
     TransmissionInfo()
         : retransmittable_frames(NULL),
           sequence_number_length(PACKET_1BYTE_SEQUENCE_NUMBER),
-          sent_time(QuicTime::Zero()) { }
+          sent_time(QuicTime::Zero()),
+          previous_transmissions(NULL) { }
     TransmissionInfo(RetransmittableFrames* retransmittable_frames,
                      QuicSequenceNumberLength sequence_number_length)
         : retransmittable_frames(retransmittable_frames),
           sequence_number_length(sequence_number_length),
-          sent_time(QuicTime::Zero()) {
+          sent_time(QuicTime::Zero()),
+          previous_transmissions(NULL) {
     }
 
     RetransmittableFrames* retransmittable_frames;
     QuicSequenceNumberLength sequence_number_length;
     // Zero when the packet is serialized, non-zero once it's sent.
     QuicTime sent_time;
+    // Stores all previous transmissions if the packet has been retransmitted,
+    // and is NULL otherwise.
+    SequenceNumberSet* previous_transmissions;
   };
 
   typedef linked_hash_map<QuicPacketSequenceNumber,
@@ -252,11 +257,6 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   QuicSequenceNumberLength GetSequenceNumberLength(
       QuicPacketSequenceNumber sequence_number) const;
 
-  // Returns the sequence number of the packet that |sequence_number| was
-  // most recently transmitted as.
-  QuicPacketSequenceNumber GetMostRecentTransmission(
-      QuicPacketSequenceNumber sequence_number) const;
-
   // 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);
@@ -276,12 +276,6 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   // Pending retransmissions which have not been packetized and sent yet.
   PendingRetransmissionMap pending_retransmissions_;
 
-  // Map from sequence number to set of all sequence number that this packet has
-  // been transmitted as.  If a packet has not been retransmitted, it will not
-  // have an entry in this map.  If any transmission of a packet has been acked
-  // it will not have an entry in this map.
-  PreviousTransmissionMap previous_transmissions_map_;
-
   // Tracks if the connection was created by the server.
   bool is_server_;