Land 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 "net/base/linked_hash_map.h"
+#include "net/quic/quic_ack_notifier_manager.h"
 #include "net/quic/quic_protocol.h"
 
 NET_EXPORT_PRIVATE extern bool FLAGS_track_retransmission_history;
 
 namespace net {
 
 // Class which tracks the set of packets sent on a QUIC connection.
 // It keeps track of the retransmittable data ssociated with each
 // packets. If a packet is retransmitted, it will keep track of each
 // version of a packet so that if a previous transmission is acked,
@@ skipping 211 matching lines @@
   // 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_;
 
   HelperInterface* helper_;
 
+  // An AckNotifier can register to be informed when ACKs have been received for
+  // all packets that a given block of data was sent in. The AckNotifierManager
+  // maintains the currently active notifiers.
+  AckNotifierManager ack_notifier_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicSentPacketManager);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_SENT_PACKET_MANAGER_H_