Land 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 4c755b6e2d02ff3d0f039edc13211b6fa87c6170..4987bccf3f9e2f084cdbd998ed010abd36245ec5 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -15,6 +15,7 @@
 
 #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;
@@ -246,6 +247,11 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   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);
 };