Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index 0d649d38f0ffb0de5d18d5ef040f0f4d21c9c934..a8c67f7191026973115047fc40be2c27ec397008 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -386,11 +386,13 @@ size_t GetPacketLengthForOneStream(
   // TODO(wtc): the hardcoded use of NullEncrypter here seems wrong.
   size_t packet_length = NullEncrypter().GetCiphertextSize(payload) +
       QuicPacketCreator::StreamFramePacketOverhead(
-          1, PACKET_8BYTE_GUID, include_version, is_in_fec_group);
+          1, PACKET_8BYTE_GUID, include_version,
+          PACKET_6BYTE_SEQUENCE_NUMBER, is_in_fec_group);
 
   size_t ack_length = NullEncrypter().GetCiphertextSize(
       QuicFramer::GetMinAckFrameSize()) +
-      GetPacketHeaderSize(PACKET_8BYTE_GUID, include_version, is_in_fec_group);
+      GetPacketHeaderSize(PACKET_8BYTE_GUID, include_version,
+                          PACKET_6BYTE_SEQUENCE_NUMBER, is_in_fec_group);
   // Make sure that if we change the size of the packet length for one stream
   // or the ack frame; that all our test are configured correctly.
   DCHECK_GE(packet_length, ack_length);