Land Recent QUIC Changes.

net/quic/quic_protocol_test.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/quic_protocol.h"
 
 #include "base/stl_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ skipping 17 matching lines @@
   QuicTag tag = MakeQuicTag('A', 'B', 'C', 'D');
   char bytes[4];
   memcpy(bytes, &tag, 4);
   EXPECT_EQ('A', bytes[0]);
   EXPECT_EQ('B', bytes[1]);
   EXPECT_EQ('C', bytes[2]);
   EXPECT_EQ('D', bytes[3]);
 }
 
 TEST(QuicProtocolTest, IsAawaitingPacket) {
-  ReceivedPacketInfo received_info;
-  received_info.largest_observed = 10u;
-  EXPECT_TRUE(IsAwaitingPacket(received_info, 11u));
-  EXPECT_FALSE(IsAwaitingPacket(received_info, 1u));
+  QuicAckFrame ack_frame;
+  ack_frame.largest_observed = 10u;
+  EXPECT_TRUE(IsAwaitingPacket(ack_frame, 11u));
+  EXPECT_FALSE(IsAwaitingPacket(ack_frame, 1u));
 
-  received_info.missing_packets.insert(10);
-  EXPECT_TRUE(IsAwaitingPacket(received_info, 10u));
+  ack_frame.missing_packets.insert(10);
+  EXPECT_TRUE(IsAwaitingPacket(ack_frame, 10u));
 }
 
 TEST(QuicProtocolTest, InsertMissingPacketsBetween) {
-  ReceivedPacketInfo received_info;
-  InsertMissingPacketsBetween(&received_info, 4u, 10u);
-  EXPECT_EQ(6u, received_info.missing_packets.size());
+  QuicAckFrame ack_frame;
+  InsertMissingPacketsBetween(&ack_frame, 4u, 10u);
+  EXPECT_EQ(6u, ack_frame.missing_packets.size());
 
   QuicPacketSequenceNumber i = 4;
-  for (SequenceNumberSet::iterator it = received_info.missing_packets.begin();
-       it != received_info.missing_packets.end(); ++it, ++i) {
+  for (SequenceNumberSet::iterator it = ack_frame.missing_packets.begin();
+       it != ack_frame.missing_packets.end(); ++it, ++i) {
     EXPECT_EQ(i, *it);
   }
 }
 
 TEST(QuicProtocolTest, QuicVersionToQuicTag) {
   // If you add a new version to the QuicVersion enum you will need to add a new
   // case to QuicVersionToQuicTag, otherwise this test will fail.
 
   // TODO(rtenneti): Enable checking of Log(ERROR) messages.
 #if 0
@@ skipping 97 matching lines @@
   // Make sure that all supported versions are present in QuicVersionToString.
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     QuicVersion version = kSupportedQuicVersions[i];
     EXPECT_NE("QUIC_VERSION_UNSUPPORTED", QuicVersionToString(version));
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net