Land Recent QUIC changes.

net/quic/quic_packet_generator.h

Index: net/quic/quic_packet_generator.h
diff --git a/net/quic/quic_packet_generator.h b/net/quic/quic_packet_generator.h
index f61e6e4cb0caf32775650ec1012a3b683293c383..75472a17f5071bf335ac793309f2f733bb0b3949 100644
--- a/net/quic/quic_packet_generator.h
+++ b/net/quic/quic_packet_generator.h
@@ -57,6 +57,8 @@
 
 namespace net {
 
+class QuicAckNotifier;
+
 class NET_EXPORT_PRIVATE QuicPacketGenerator {
  public:
   class NET_EXPORT_PRIVATE DelegateInterface {
@@ -90,11 +92,24 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
 
   void SetShouldSendAck(bool also_send_feedback);
   void AddControlFrame(const QuicFrame& frame);
+
+  // Given some data, may consume part or all of it and pass it to the packet
+  // creator to be serialized into packets. If not in batch mode, these packets
+  // will also be sent during this call.
   QuicConsumedData ConsumeData(QuicStreamId id,
                                base::StringPiece data,
                                QuicStreamOffset offset,
                                bool fin);
 
+  // As above, but attaches a QuicAckNotifier to any created stream frames,
+  // which will be called once the frame is ACKed by the peer.
+  // The QuicAckNotifier is owned by the QuicConnection.
+  QuicConsumedData ConsumeData(QuicStreamId id,
+                               base::StringPiece data,
+                               QuicStreamOffset offset,
+                               bool fin,
+                               QuicAckNotifier* notifier);
+
   // Indicates whether batch mode is currently enabled.
   bool InBatchMode();
   // Disables flushing.
@@ -121,6 +136,7 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
   bool AddNextPendingFrame();
 
   bool AddFrame(const QuicFrame& frame);
+
   void SerializeAndSendPacket();
 
   DelegateInterface* delegate_;