Landing Recent QUIC Changes.

net/quic/quic_protocol.h

Index: net/quic/quic_protocol.h
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index 0d9fb84ba6f3dd69ccdba86e0008dd7981e4b460..a15c91289e84261f4ff7fa6f40b8250784e58259 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -647,6 +647,7 @@ struct NET_EXPORT_PRIVATE QuicStreamFrame {
 // TODO(ianswett): Re-evaluate the trade-offs of hash_set vs set when framing
 // is finalized.
 typedef std::set<QuicPacketSequenceNumber> SequenceNumberSet;
+typedef std::list<QuicPacketSequenceNumber> SequenceNumberList;
 
 typedef std::list<std::pair<QuicPacketSequenceNumber, QuicTime>> PacketTimeList;
 
@@ -1053,16 +1054,14 @@ struct NET_EXPORT_PRIVATE TransmissionInfo {
   // Constructs a Transmission with a new all_tranmissions set
   // containing |sequence_number|.
   TransmissionInfo(RetransmittableFrames* retransmittable_frames,
-                   QuicPacketSequenceNumber sequence_number,
                    QuicSequenceNumberLength sequence_number_length);
 
   // Constructs a Transmission with the specified |all_tranmissions| set
   // and inserts |sequence_number| into it.
   TransmissionInfo(RetransmittableFrames* retransmittable_frames,
-                   QuicPacketSequenceNumber sequence_number,
                    QuicSequenceNumberLength sequence_number_length,
                    TransmissionType transmission_type,
-                   SequenceNumberSet* all_transmissions);
+                   SequenceNumberList* all_transmissions);
 
   RetransmittableFrames* retransmittable_frames;
   QuicSequenceNumberLength sequence_number_length;
@@ -1075,7 +1074,7 @@ struct NET_EXPORT_PRIVATE TransmissionInfo {
   TransmissionType transmission_type;
   // Stores the sequence numbers of all transmissions of this packet.
   // Can never be null.
-  SequenceNumberSet* all_transmissions;
+  SequenceNumberList* all_transmissions;
   // In flight packets have not been abandoned or lost.
   bool in_flight;
 };