Landing Recent QUIC Changes.

net/quic/quic_sent_packet_manager.h

Index: net/quic/quic_sent_packet_manager.h
diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 342dd3d4653144005b9ad3ae86db254a8ba58c10..84294d19d26226cfe77c8d2a6ff47e518bbbd6e2 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -5,10 +5,7 @@
 #ifndef NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_
 #define NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_
 
-#include <deque>
-#include <list>
 #include <map>
-#include <queue>
 #include <set>
 #include <utility>
 #include <vector>
@@ -57,7 +54,8 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
     virtual void OnSentPacket(
         QuicPacketSequenceNumber sequence_number,
         QuicTime sent_time,
-        QuicByteCount bytes) {}
+        QuicByteCount bytes,
+        TransmissionType transmission_type) {}
 
     virtual void OnRetransmittedPacket(
         QuicPacketSequenceNumber old_sequence_number,
@@ -71,6 +69,9 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
         QuicPacketSequenceNumber largest_observed,
         bool largest_observed_acked,
         QuicPacketSequenceNumber least_unacked_sent_packet) {}
+
+    virtual void OnSerializedPacket(
+        const SerializedPacket& packet) {}
   };
 
   // Interface which gets callbacks from the QuicSentPacketManager when
@@ -314,9 +315,9 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   // Removes the retransmittability and pending properties from the packet at
   // |it| due to receipt by the peer.  Returns an iterator to the next remaining
   // unacked packet.
-  QuicUnackedPacketMap::const_iterator MarkPacketHandled(
-      QuicUnackedPacketMap::const_iterator it,
-      QuicTime::Delta delta_largest_observed);
+  void MarkPacketHandled(QuicPacketSequenceNumber sequence_number,
+                         const TransmissionInfo& info,
+                         QuicTime::Delta delta_largest_observed);
 
   // Request that |sequence_number| be retransmitted after the other pending
   // retransmissions.  Does not add it to the retransmissions if it's already
@@ -326,7 +327,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   // Notify observers about spurious retransmits.
   void RecordSpuriousRetransmissions(
-      const SequenceNumberSet& all_transmissions,
+      const SequenceNumberList& all_transmissions,
       QuicPacketSequenceNumber acked_sequence_number);
 
   // Newly serialized retransmittable and fec packets are added to this map,