Land Recent QUIC Changes.

net/quic/quic_received_packet_manager_test.cc

 // Copyright 2013 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/quic_received_packet_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "net/quic/quic_connection_stats.h"
@@ skipping 289 matching lines @@
   EXPECT_FALSE(received_manager_.IsAwaitingPacket(3u));
   EXPECT_TRUE(received_manager_.IsAwaitingPacket(6u));
 }
 
 TEST_F(QuicReceivedPacketManagerTest, UpdateReceivedPacketInfo) {
   QuicPacketHeader header;
   header.packet_sequence_number = 2u;
   QuicTime two_ms = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(2));
   received_manager_.RecordPacketReceived(0u, header, two_ms);
 
-  ReceivedPacketInfo info;
-  received_manager_.UpdateReceivedPacketInfo(&info, QuicTime::Zero());
+  QuicAckFrame ack;
+  received_manager_.UpdateReceivedPacketInfo(&ack, QuicTime::Zero());
   // When UpdateReceivedPacketInfo with a time earlier than the time of the
   // largest observed packet, make sure that the delta is 0, not negative.
-  EXPECT_EQ(QuicTime::Delta::Zero(), info.delta_time_largest_observed);
+  EXPECT_EQ(QuicTime::Delta::Zero(), ack.delta_time_largest_observed);
 
   QuicTime four_ms = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(4));
-  received_manager_.UpdateReceivedPacketInfo(&info, four_ms);
+  received_manager_.UpdateReceivedPacketInfo(&ack, four_ms);
   // When UpdateReceivedPacketInfo after not having received a new packet,
   // the delta should still be accurate.
   EXPECT_EQ(QuicTime::Delta::FromMilliseconds(2),
-            info.delta_time_largest_observed);
+            ack.delta_time_largest_observed);
 }
 
 TEST_F(QuicReceivedPacketManagerTest, UpdateReceivedConnectionStats) {
   RecordPacketReceipt(1, 0);
   RecordPacketReceipt(6, 0);
   RecordPacketReceipt(
       2, 0, QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1)));
 
   EXPECT_EQ(4u, stats_.max_sequence_reordering);
   EXPECT_EQ(1000u, stats_.max_time_reordering_us);
   EXPECT_EQ(1u, stats_.packets_reordered);
 }
 
 TEST_F(QuicReceivedPacketManagerTest, RevivedPacket) {
   RecordPacketReceipt(1, 0);
   RecordPacketReceipt(3, 0);
   RecordPacketRevived(2);
 
-  ReceivedPacketInfo info;
-  received_manager_.UpdateReceivedPacketInfo(&info, QuicTime::Zero());
-  EXPECT_EQ(1u, info.missing_packets.size());
-  EXPECT_EQ(2u, *info.missing_packets.begin());
-  EXPECT_EQ(1u, info.revived_packets.size());
-  EXPECT_EQ(2u, *info.missing_packets.begin());
+  QuicAckFrame ack;
+  received_manager_.UpdateReceivedPacketInfo(&ack, QuicTime::Zero());
+  EXPECT_EQ(1u, ack.missing_packets.size());
+  EXPECT_EQ(2u, *ack.missing_packets.begin());
+  EXPECT_EQ(1u, ack.revived_packets.size());
+  EXPECT_EQ(2u, *ack.missing_packets.begin());
 }
 
 TEST_F(QuicReceivedPacketManagerTest, PacketRevivedThenReceived) {
   RecordPacketReceipt(1, 0);
   RecordPacketReceipt(3, 0);
   RecordPacketRevived(2);
   RecordPacketReceipt(2, 0);
 
-  ReceivedPacketInfo info;
-  received_manager_.UpdateReceivedPacketInfo(&info, QuicTime::Zero());
-  EXPECT_TRUE(info.missing_packets.empty());
-  EXPECT_TRUE(info.revived_packets.empty());
+  QuicAckFrame ack;
+  received_manager_.UpdateReceivedPacketInfo(&ack, QuicTime::Zero());
+  EXPECT_TRUE(ack.missing_packets.empty());
+  EXPECT_TRUE(ack.revived_packets.empty());
 }
 
 
 }  // namespace
 }  // namespace test
 }  // namespace net