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 4b576c615dafdf74c4e8b3870bb73ad5afa07918..175a80de2e21b9d96eb7d6c3dccec7d86f588ac7 100644 |
--- a/net/quic/quic_sent_packet_manager_test.cc |
+++ b/net/quic/quic_sent_packet_manager_test.cc |
@@ -53,21 +53,6 @@ class QuicSentPacketManagerTest : public ::testing::TestWithParam<bool> { |
} |
} |
- void VerifyPendingPackets(QuicPacketSequenceNumber* packets, |
- size_t num_packets) { |
- const SequenceNumberSet& pending_packets = |
- QuicSentPacketManagerPeer::GetPendingPackets(&manager_); |
- if (num_packets == 0) { |
- EXPECT_TRUE(pending_packets.empty()); |
- return; |
- } |
- |
- EXPECT_EQ(num_packets, pending_packets.size()); |
- for (size_t i = 0; i < num_packets; ++i) { |
- EXPECT_TRUE(ContainsKey(pending_packets, packets[i])) << packets[i]; |
- } |
- } |
- |
void VerifyRetransmittablePackets(QuicPacketSequenceNumber* packets, |
size_t num_packets) { |
SequenceNumberSet unacked = manager_.GetUnackedPackets(); |
@@ -267,7 +252,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitThenAckPrevious) { |
// 2 remains unacked, but no packets have retransmittable data. |
QuicPacketSequenceNumber unacked[] = { 2 }; |
VerifyUnackedPackets(unacked, arraysize(unacked)); |
- VerifyPendingPackets(NULL, 0); |
+ EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); |
VerifyRetransmittablePackets(NULL, 0); |
// Verify that the retransmission alarm would not fire, |
@@ -310,7 +295,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitThenAckPreviousThenNackRetransmit) { |
// No packets remain unacked. |
VerifyUnackedPackets(NULL, 0); |
- VerifyPendingPackets(NULL, 0); |
+ EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); |
VerifyRetransmittablePackets(NULL, 0); |
// Verify that the retransmission alarm would not fire, |
@@ -336,7 +321,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitTwiceThenAckPreviousBeforeSend) { |
// Since 2 was marked for retransmit, when 1 is acked, 2 is discarded. |
VerifyUnackedPackets(NULL, 0); |
- VerifyPendingPackets(NULL, 0); |
+ EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); |
VerifyRetransmittablePackets(NULL, 0); |
// Verify that the retransmission alarm would not fire, |
@@ -358,7 +343,7 @@ TEST_F(QuicSentPacketManagerTest, RetransmitTwiceThenAckFirst) { |
// 3 remains unacked, but no packets have retransmittable data. |
QuicPacketSequenceNumber unacked[] = { 3 }; |
VerifyUnackedPackets(unacked, arraysize(unacked)); |
- VerifyPendingPackets(NULL, 0); |
+ EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); |
VerifyRetransmittablePackets(NULL, 0); |
// Verify that the retransmission alarm would not fire to abandon packet 3. |