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 8d415bf9970191f01387e20acf016db2bcb8a442..940b259adf7bd7b6bd8e9964525db856ffa465cd 100644
--- a/net/quic/quic_packet_generator.h
+++ b/net/quic/quic_packet_generator.h
@@ -15,7 +15,7 @@
 // If the Delegate is not writable, then no operations will cause
 // a packet to be serialized.  In particular:
 // * SetShouldSendAck will simply record that an ack is to be sent.
-// * AddControlFram will enqueue the control frame.
+// * AddControlFrame will enqueue the control frame.
 // * ConsumeData will do nothing.
 //
 // If the Delegate is writable, then the behavior depends on the second
@@ -91,20 +91,20 @@ class NET_EXPORT_PRIVATE QuicPacketGenerator {
 
   virtual ~QuicPacketGenerator();
 
+  // Indicates that an ACK frame should be sent.  If |also_send_feedback| is
+  // true, then it also indicates a CONGESTION_FEEDBACK frame should be sent.
+  // The contents of the frame(s) will be generated via a call to the delegates
+  // CreateAckFrame() and CreateFeedbackFrame() when the packet is serialized.
   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.
+  // 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. Also
+  // 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. |notifier| may
+  // be NULL.
   QuicConsumedData ConsumeData(QuicStreamId id,
                                base::StringPiece data,
                                QuicStreamOffset offset,