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 cb5862531f4ebf83a2df66a380f0349fccb245fc..86a5c0ed57620d592da20f0c3e3271e40fa77669 100644
--- a/net/quic/quic_packet_creator.h
+++ b/net/quic/quic_packet_creator.h
@@ -33,7 +33,8 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
         : max_packet_length(kMaxPacketSize),
           random_reorder(false),
           max_packets_per_fec_group(0),
-          send_guid_length(PACKET_8BYTE_GUID) {
+          send_guid_length(PACKET_8BYTE_GUID),
+          send_sequence_number_length(PACKET_6BYTE_SEQUENCE_NUMBER) {
     }
 
     size_t max_packet_length;
@@ -42,6 +43,7 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
     size_t max_packets_per_fec_group;
     // Length of guid to send over the wire.
     QuicGuidLength send_guid_length;
+    QuicSequenceNumberLength send_sequence_number_length;
   };
 
   // QuicRandom* required for packet entropy.
@@ -68,10 +70,12 @@ class NET_EXPORT_PRIVATE QuicPacketCreator : public QuicFecBuilderInterface {
   void StopSendingVersion();
 
   // The overhead the framing will add for a packet with num_frames frames.
-  static size_t StreamFramePacketOverhead(int num_frames,
-                                          QuicGuidLength guid_length,
-                                          bool include_version,
-                                          InFecGroup is_in_fec_group);
+  static size_t StreamFramePacketOverhead(
+      int num_frames,
+      QuicGuidLength guid_length,
+      bool include_version,
+      QuicSequenceNumberLength sequence_number_length,
+      InFecGroup is_in_fec_group);
 
   bool HasRoomForStreamFrame() const;