Land Recent QUIC Changes until 2/21/2015.

net/quic/quic_unacked_packet_map_test.cc

 // Copyright 2014 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_unacked_packet_map.h"
 
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::min;
@@ skipping 330 matching lines @@
                                  true);
 
   QuicPacketSequenceNumber unacked4[] = { 4, 6 };
   VerifyUnackedPackets(unacked4, arraysize(unacked4));
   QuicPacketSequenceNumber pending4[] = { 6 };
   VerifyInFlightPackets(pending4, arraysize(pending4));
   QuicPacketSequenceNumber retransmittable4[] = { 6 };
   VerifyRetransmittablePackets(retransmittable4, arraysize(retransmittable4));
 }
 
-TEST_F(QuicUnackedPacketMapTest, RestoreInflight) {
-  // Simulate a retransmittable packet being sent, retransmitted, and the first
-  // transmission being acked.
-  unacked_packets_.AddSentPacket(CreateRetransmittablePacket(1), 0,
-                                 NOT_RETRANSMISSION, now_, kDefaultLength,
-                                 true);
-  unacked_packets_.RemoveFromInFlight(1);
-  unacked_packets_.AddSentPacket(CreateNonRetransmittablePacket(2), 1,
-                                 RTO_RETRANSMISSION, now_, kDefaultLength,
-                                 true);
-
-  QuicPacketSequenceNumber unacked[] = { 1, 2 };
-  VerifyUnackedPackets(unacked, arraysize(unacked));
-  QuicPacketSequenceNumber retransmittable[] = { 2 };
-  VerifyInFlightPackets(retransmittable, arraysize(retransmittable));
-  VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
-  EXPECT_EQ(kDefaultLength, unacked_packets_.bytes_in_flight());
-
-  // Simulate an F-RTO, and restore 1 to flight.
-  unacked_packets_.RestoreInFlight(1);
-  VerifyUnackedPackets(unacked, arraysize(unacked));
-  VerifyInFlightPackets(unacked, arraysize(unacked));
-  VerifyRetransmittablePackets(retransmittable, arraysize(retransmittable));
-  EXPECT_EQ(2 * kDefaultLength, unacked_packets_.bytes_in_flight());
-}
-
 TEST_F(QuicUnackedPacketMapTest, SendWithGap) {
   // Simulate a retransmittable packet being sent, retransmitted, and the first
   // transmission being acked.
   unacked_packets_.AddSentPacket(CreateRetransmittablePacket(1), 0,
                                  NOT_RETRANSMISSION, now_, kDefaultLength,
                                  true);
   unacked_packets_.AddSentPacket(CreateRetransmittablePacket(3), 0,
                                  NOT_RETRANSMISSION, now_, kDefaultLength,
                                  true);
   unacked_packets_.AddSentPacket(CreateNonRetransmittablePacket(5), 3,
                                  LOSS_RETRANSMISSION, now_, kDefaultLength,
                                  true);
 
   EXPECT_EQ(1u, unacked_packets_.GetLeastUnacked());
   EXPECT_TRUE(unacked_packets_.IsUnacked(1));
   EXPECT_FALSE(unacked_packets_.IsUnacked(2));
   EXPECT_TRUE(unacked_packets_.IsUnacked(3));
   EXPECT_FALSE(unacked_packets_.IsUnacked(4));
   EXPECT_TRUE(unacked_packets_.IsUnacked(5));
   EXPECT_EQ(5u, unacked_packets_.largest_sent_packet());
 }
 
 
 }  // namespace
 }  // namespace test
 }  // namespace net