Queueing QUIC frames to be resent instead of packets and packing RST frames with acks and congestio…

net/quic/quic_protocol.h

Index: net/quic/quic_protocol.h
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index 45d63a2bedac26dc811122aa710c855c85538342..f2d60a2b7df63e04860f14a57821d3e49e680e58 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -150,7 +150,7 @@ enum QuicErrorCode {
 
   // Handshake message contained out of order tags.
   QUIC_CRYPTO_TAGS_OUT_OF_ORDER,
-  // Handshake message contained too many entires.
+  // Handshake message contained too many entries.
   QUIC_CRYPTO_TOO_MANY_ENTRIES,
   // Handshake message contained an invalid value length.
   QUIC_CRYPTO_INVALID_VALUE_LENGTH,
@@ -174,12 +174,12 @@ struct NET_EXPORT_PRIVATE QuicStreamFrame {
   QuicStreamFrame();
   QuicStreamFrame(QuicStreamId stream_id,
                   bool fin,
-                  uint64 offset,
+                  QuicStreamOffset offset,
                   base::StringPiece data);
 
   QuicStreamId stream_id;
   bool fin;
-  uint64 offset;
+  QuicStreamOffset offset;  // Location of this data in the stream.
   base::StringPiece data;
 };