Revert of Landing Recent QUIC Changes.

net/quic/quic_sent_packet_manager.h

 // Copyright 2013 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_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>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/congestion_control/loss_detection_interface.h"
 #include "net/quic/congestion_control/rtt_stats.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
@@ skipping 28 matching lines @@
     virtual ~DebugDelegate() {}
 
     // Called when a spurious retransmission is detected.
     virtual void OnSpuriousPacketRetransmition(
         TransmissionType transmission_type,
         QuicByteCount byte_size) {}
 
     virtual void OnSentPacket(
         QuicPacketSequenceNumber sequence_number,
         QuicTime sent_time,
-        QuicByteCount bytes,
-        TransmissionType transmission_type) {}
+        QuicByteCount bytes) {}
 
     virtual void OnRetransmittedPacket(
         QuicPacketSequenceNumber old_sequence_number,
         QuicPacketSequenceNumber new_sequence_number,
         TransmissionType transmission_type,
         QuicTime time) {}
 
     virtual void OnIncomingAck(
         const QuicAckFrame& ack_frame,
         QuicTime ack_receive_time,
         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
   // network-related state changes. Implementations must not mutate the
   // state of the packet manager as a result of these callbacks.
   class NET_EXPORT_PRIVATE NetworkChangeVisitor {
    public:
     virtual ~NetworkChangeVisitor() {}
 
     // Called when congestion window may have changed.
@@ skipping 223 matching lines @@
 
   // Marks |sequence_number| as having been revived by the peer, but not
   // received, so the packet remains pending if it is and the congestion control
   // does not consider the packet acked.
   void MarkPacketRevived(QuicPacketSequenceNumber sequence_number,
                          QuicTime::Delta delta_largest_observed);
 
   // 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.
-  void MarkPacketHandled(QuicPacketSequenceNumber sequence_number,
-                         const TransmissionInfo& info,
-                         QuicTime::Delta delta_largest_observed);
+  QuicUnackedPacketMap::const_iterator MarkPacketHandled(
+      QuicUnackedPacketMap::const_iterator it,
+      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
   // a pending retransmission.
   void MarkForRetransmission(QuicPacketSequenceNumber sequence_number,
                              TransmissionType transmission_type);
 
   // Notify observers about spurious retransmits.
   void RecordSpuriousRetransmissions(
-      const SequenceNumberList& all_transmissions,
+      const SequenceNumberSet& all_transmissions,
       QuicPacketSequenceNumber acked_sequence_number);
 
   // 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.
@@ skipping 49 matching lines @@
   // Records bandwidth from server to client in normal operation, over periods
   // of time with no loss events.
   QuicSustainedBandwidthRecorder sustained_bandwidth_recorder_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSentPacketManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_