Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/quic_test_utils.h"
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 368 matching lines @@
   CryptoHandshakeMessage message;
   message.set_tag(tag);
   return ConstructPacketFromHandshakeMessage(guid, message, false);
 }
 
 size_t GetPacketLengthForOneStream(
     bool include_version, InFecGroup is_in_fec_group, size_t payload) {
   // 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);
   return packet_length;
 }
 
 QuicPacketEntropyHash TestEntropyCalculator::ReceivedEntropyHash(
     QuicPacketSequenceNumber sequence_number) const {
   return 1u;
 }
 
 QuicConfig DefaultQuicConfig() {
   QuicConfig config;
   config.SetDefaults();
   return config;
 }
 
 bool TestDecompressorVisitor::OnDecompressedData(StringPiece data) {
   data.AppendToString(&data_);
   return true;
 }
 
 void TestDecompressorVisitor::OnDecompressionError() {
   error_ = true;
 }
 
 }  // namespace test
 }  // namespace net