Inline the members of QUIC's ReceivedPacketInfo into QuicAckFrame now

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/sha1.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/crypto/crypto_framer.h"
@@ skipping 27 matching lines @@
   }
 
   virtual void SetImpl() OVERRIDE {}
   virtual void CancelImpl() OVERRIDE {}
 };
 
 }  // namespace
 
 QuicAckFrame MakeAckFrame(QuicPacketSequenceNumber largest_observed) {
   QuicAckFrame ack;
-  ack.received_info.largest_observed = largest_observed;
-  ack.received_info.entropy_hash = 0;
+  ack.largest_observed = largest_observed;
+  ack.entropy_hash = 0;
   return ack;
 }
 
 QuicAckFrame MakeAckFrameWithNackRanges(
     size_t num_nack_ranges, QuicPacketSequenceNumber least_unacked) {
   QuicAckFrame ack = MakeAckFrame(2 * num_nack_ranges + least_unacked);
   // Add enough missing packets to get num_nack_ranges nack ranges.
   for (QuicPacketSequenceNumber i = 1; i < 2 * num_nack_ranges; i += 2) {
-    ack.received_info.missing_packets.insert(least_unacked + i);
+    ack.missing_packets.insert(least_unacked + i);
   }
   return ack;
 }
 
 SerializedPacket BuildUnsizedDataPacket(QuicFramer* framer,
                                         const QuicPacketHeader& header,
                                         const QuicFrames& frames) {
   const size_t max_plaintext_size = framer->GetMaxPlaintextSize(kMaxPacketSize);
   size_t packet_size = GetPacketHeaderSize(header);
   for (size_t i = 0; i < frames.size(); ++i) {
@@ skipping 482 matching lines @@
 size_t GetPacketLengthForOneStream(
     QuicVersion version,
     bool include_version,
     QuicSequenceNumberLength sequence_number_length,
     InFecGroup is_in_fec_group,
     size_t* payload_length) {
   *payload_length = 1;
   const size_t stream_length =
       NullEncrypter().GetCiphertextSize(*payload_length) +
       QuicPacketCreator::StreamFramePacketOverhead(
-          version, PACKET_8BYTE_CONNECTION_ID, include_version,
+          PACKET_8BYTE_CONNECTION_ID, include_version,
           sequence_number_length, 0u, is_in_fec_group);
   const size_t ack_length = NullEncrypter().GetCiphertextSize(
       QuicFramer::GetMinAckFrameSize(
-          version, sequence_number_length, PACKET_1BYTE_SEQUENCE_NUMBER)) +
+          sequence_number_length, PACKET_1BYTE_SEQUENCE_NUMBER)) +
       GetPacketHeaderSize(PACKET_8BYTE_CONNECTION_ID, include_version,
                           sequence_number_length, is_in_fec_group);
   if (stream_length < ack_length) {
     *payload_length = 1 + ack_length - stream_length;
   }
 
   return NullEncrypter().GetCiphertextSize(*payload_length) +
       QuicPacketCreator::StreamFramePacketOverhead(
-          version, PACKET_8BYTE_CONNECTION_ID, include_version,
+          PACKET_8BYTE_CONNECTION_ID, include_version,
           sequence_number_length, 0u, is_in_fec_group);
 }
 
 TestEntropyCalculator::TestEntropyCalculator() {}
 
 TestEntropyCalculator::~TestEntropyCalculator() {}
 
 QuicPacketEntropyHash TestEntropyCalculator::EntropyHash(
     QuicPacketSequenceNumber sequence_number) const {
   return 1u;
@@ skipping 16 matching lines @@
 }
 
 QuicVersionVector SupportedVersions(QuicVersion version) {
   QuicVersionVector versions;
   versions.push_back(version);
   return versions;
 }
 
 }  // namespace test
 }  // namespace net