Land Recent QUIC changes.

net/quic/quic_packet_creator.h

Index: net/quic/quic_packet_creator.h
diff --git a/net/quic/quic_packet_creator.h b/net/quic/quic_packet_creator.h
index e4fc2e70e7fe5d527226ffd4515afbda07d01cf7..0e0a8c778938fc2c7a109947bb1d9020d8627046 100644
--- a/net/quic/quic_packet_creator.h
+++ b/net/quic/quic_packet_creator.h
@@ -23,6 +23,7 @@ namespace test {
 class QuicPacketCreatorPeer;
 }
 
+class QuicAckNotifier;
 class QuicRandom;
 
 class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
@@ -89,6 +90,17 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
                            bool fin,
                            QuicFrame* frame);
 
+  // As above, but keeps track of an QuicAckNotifier that should be called when
+  // the packet that contains this stream frame is ACKed.
+  // The |notifier| is not owned by the QuicPacketGenerator and must outlive the
+  // generated packet.
+  size_t CreateStreamFrameWithNotifier(QuicStreamId id,
+                                       base::StringPiece data,
+                                       QuicStreamOffset offset,
+                                       bool fin,
+                                       QuicAckNotifier* notifier,
+                                       QuicFrame* frame);
+
   // Serializes all frames into a single packet. All frames must fit into a
   // single packet. Also, sets the entropy hash of the serialized packet to a
   // random bool and returns that value as a member of SerializedPacket.