| Index: net/quic/quic_sent_packet_manager_test.cc
|
| diff --git a/net/quic/quic_sent_packet_manager_test.cc b/net/quic/quic_sent_packet_manager_test.cc
|
| index 2cf3a60287cdf893d786667c5099d5cfdb06e20c..76de6eda5857346e8edf3deab76b1335b696d0ba 100644
|
| --- a/net/quic/quic_sent_packet_manager_test.cc
|
| +++ b/net/quic/quic_sent_packet_manager_test.cc
|
| @@ -206,14 +206,6 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
|
| return packet;
|
| }
|
|
|
| - SerializedPacket CreateFecPacket(QuicPacketNumber packet_number) {
|
| - SerializedPacket serialized(kDefaultPathId, packet_number,
|
| - PACKET_6BYTE_PACKET_NUMBER, nullptr,
|
| - kDefaultLength, 0u, false, false);
|
| - serialized.is_fec_packet = true;
|
| - return serialized;
|
| - }
|
| -
|
| void SendDataPacket(QuicPacketNumber packet_number) {
|
| EXPECT_CALL(*send_algorithm_,
|
| OnPacketSent(_, BytesInFlight(), packet_number, _, _))
|
| @@ -238,17 +230,6 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> {
|
| HAS_RETRANSMITTABLE_DATA);
|
| }
|
|
|
| - void SendFecPacket(QuicPacketNumber packet_number) {
|
| - EXPECT_CALL(*send_algorithm_,
|
| - OnPacketSent(_, BytesInFlight(), packet_number, kDefaultLength,
|
| - HAS_RETRANSMITTABLE_DATA))
|
| - .Times(1)
|
| - .WillOnce(Return(true));
|
| - SerializedPacket packet(CreateFecPacket(packet_number));
|
| - manager_.OnPacketSent(&packet, 0, clock_.Now(), NOT_RETRANSMISSION,
|
| - NO_RETRANSMITTABLE_DATA);
|
| - }
|
| -
|
| void SendAckPacket(QuicPacketNumber packet_number) {
|
| EXPECT_CALL(*send_algorithm_,
|
| OnPacketSent(_, BytesInFlight(), packet_number, kDefaultLength,
|
| @@ -548,53 +529,6 @@ TEST_F(QuicSentPacketManagerTest, GetLeastUnackedUnacked) {
|
| EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| }
|
|
|
| -TEST_F(QuicSentPacketManagerTest, GetLeastUnackedUnackedFec) {
|
| - SendFecPacket(1);
|
| - EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| -}
|
| -
|
| -TEST_F(QuicSentPacketManagerTest, GetLeastUnackedAndDiscard) {
|
| - VerifyUnackedPackets(nullptr, 0);
|
| -
|
| - SendFecPacket(1);
|
| - EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| -
|
| - SendFecPacket(2);
|
| - EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| -
|
| - SendFecPacket(3);
|
| - EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| -
|
| - QuicPacketNumber unacked[] = {1, 2, 3};
|
| - VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - VerifyRetransmittablePackets(nullptr, 0);
|
| -
|
| - // Ack 2, so there's an rtt update.
|
| - ExpectAck(2);
|
| - QuicAckFrame ack_frame;
|
| - ack_frame.largest_observed = 2;
|
| - ack_frame.missing_packets.Add(1);
|
| - manager_.OnIncomingAck(ack_frame, clock_.Now());
|
| -
|
| - EXPECT_EQ(1u, manager_.GetLeastUnacked());
|
| -}
|
| -
|
| -TEST_F(QuicSentPacketManagerTest, GetSentTime) {
|
| - VerifyUnackedPackets(nullptr, 0);
|
| -
|
| - QuicTime sent_time = clock_.Now();
|
| - SendFecPacket(1);
|
| - QuicTime sent_time2 = clock_.Now();
|
| - SendFecPacket(2);
|
| - QuicPacketNumber unacked[] = {1, 2};
|
| - VerifyUnackedPackets(unacked, arraysize(unacked));
|
| - VerifyRetransmittablePackets(nullptr, 0);
|
| -
|
| - EXPECT_TRUE(manager_.HasUnackedPackets());
|
| - EXPECT_EQ(sent_time, QuicSentPacketManagerPeer::GetSentTime(&manager_, 1));
|
| - EXPECT_EQ(sent_time2, QuicSentPacketManagerPeer::GetSentTime(&manager_, 2));
|
| -}
|
| -
|
| TEST_F(QuicSentPacketManagerTest, AckAckAndUpdateRtt) {
|
| SendDataPacket(1);
|
| SendAckPacket(2);
|
|
|