Remove QuicSentPacketManagerPeer::HasPendingPackets. gfe-relnote: n/a (Test only change) PiperOrigin-RevId: 244385968 Change-Id: I9aa16888ae4393673cd80ad6235007525c388814
diff --git a/quic/core/quic_sent_packet_manager_test.cc b/quic/core/quic_sent_packet_manager_test.cc index 6d0dd4c..0ac8df7 100644 --- a/quic/core/quic_sent_packet_manager_test.cc +++ b/quic/core/quic_sent_packet_manager_test.cc
@@ -379,7 +379,7 @@ // Packet 1 is unacked, pending, but not retransmittable. uint64_t unacked[] = {1}; VerifyUnackedPackets(unacked, QUIC_ARRAYSIZE(unacked)); - EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_TRUE(manager_.HasInFlightPackets()); VerifyRetransmittablePackets(nullptr, 0); } @@ -466,7 +466,7 @@ // 2 remains unacked, but no packets have retransmittable data. uint64_t unacked[] = {2}; VerifyUnackedPackets(unacked, QUIC_ARRAYSIZE(unacked)); - EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_TRUE(manager_.HasInFlightPackets()); VerifyRetransmittablePackets(nullptr, 0); if (manager_.session_decides_what_to_write()) { // Ack 2 causes 2 be considered as spurious retransmission. @@ -540,7 +540,7 @@ // No packets remain unacked. VerifyUnackedPackets(nullptr, 0); } - EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_FALSE(manager_.HasInFlightPackets()); VerifyRetransmittablePackets(nullptr, 0); // Verify that the retransmission alarm would not fire, @@ -573,7 +573,7 @@ // Since 2 was marked for retransmit, when 1 is acked, 2 is kept for RTT. uint64_t unacked[] = {2}; VerifyUnackedPackets(unacked, QUIC_ARRAYSIZE(unacked)); - EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_FALSE(manager_.HasInFlightPackets()); VerifyRetransmittablePackets(nullptr, 0); // Verify that the retransmission alarm would not fire, @@ -617,7 +617,7 @@ // 2 and 3 remain unacked, but no packets have retransmittable data. uint64_t unacked[] = {2, 3}; VerifyUnackedPackets(unacked, QUIC_ARRAYSIZE(unacked)); - EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_TRUE(manager_.HasInFlightPackets()); VerifyRetransmittablePackets(nullptr, 0); // Ensure packet 2 is lost when 4 is sent and 3 and 4 are acked. @@ -639,7 +639,7 @@ uint64_t unacked2[] = {2}; VerifyUnackedPackets(unacked2, QUIC_ARRAYSIZE(unacked2)); - EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_TRUE(manager_.HasInFlightPackets()); SendDataPacket(5); ExpectAckAndLoss(true, 5, 2); @@ -665,7 +665,7 @@ } else { VerifyUnackedPackets(nullptr, 0); } - EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_FALSE(manager_.HasInFlightPackets()); if (manager_.session_decides_what_to_write()) { // Spurious retransmission is detected when packet 3 gets acked. We cannot // know packet 2 is a spurious until it gets acked. @@ -889,7 +889,7 @@ EXPECT_EQ(PACKETS_NEWLY_ACKED, manager_.OnAckFrameEnd(clock_.Now(), ENCRYPTION_INITIAL)); - EXPECT_TRUE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_TRUE(manager_.HasInFlightPackets()); // Acking two more packets will lose both of them due to nacks. SendDataPacket(4); @@ -912,7 +912,7 @@ manager_.OnAckFrameEnd(clock_.Now(), ENCRYPTION_INITIAL)); EXPECT_FALSE(manager_.HasPendingRetransmissions()); - EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_FALSE(manager_.HasInFlightPackets()); EXPECT_EQ(2u, stats_.tlp_count); EXPECT_EQ(0u, stats_.rto_count); } @@ -1269,7 +1269,7 @@ EXPECT_TRUE(manager_.HasPendingRetransmissions()); } EXPECT_TRUE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_)); - EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_FALSE(manager_.HasInFlightPackets()); } TEST_P(QuicSentPacketManagerTest, @@ -1315,7 +1315,7 @@ VerifyRetransmittablePackets(nullptr, 0); EXPECT_FALSE(manager_.HasPendingRetransmissions()); EXPECT_FALSE(QuicSentPacketManagerPeer::HasUnackedCryptoPackets(&manager_)); - EXPECT_FALSE(QuicSentPacketManagerPeer::HasPendingPackets(&manager_)); + EXPECT_FALSE(manager_.HasInFlightPackets()); // Ensure both packets get discarded when packet 2 is acked. uint64_t acked[] = {3};
diff --git a/quic/test_tools/quic_sent_packet_manager_peer.cc b/quic/test_tools/quic_sent_packet_manager_peer.cc index 3057e5e..41b2c43 100644 --- a/quic/test_tools/quic_sent_packet_manager_peer.cc +++ b/quic/test_tools/quic_sent_packet_manager_peer.cc
@@ -79,12 +79,6 @@ } // static -bool QuicSentPacketManagerPeer::HasPendingPackets( - const QuicSentPacketManager* sent_packet_manager) { - return sent_packet_manager->unacked_packets_.HasInFlightPackets(); -} - -// static bool QuicSentPacketManagerPeer::IsRetransmission( QuicSentPacketManager* sent_packet_manager, uint64_t packet_number) {
diff --git a/quic/test_tools/quic_sent_packet_manager_peer.h b/quic/test_tools/quic_sent_packet_manager_peer.h index 23244e5..bab5836 100644 --- a/quic/test_tools/quic_sent_packet_manager_peer.h +++ b/quic/test_tools/quic_sent_packet_manager_peer.h
@@ -46,9 +46,6 @@ static RttStats* GetRttStats(QuicSentPacketManager* sent_packet_manager); - static bool HasPendingPackets( - const QuicSentPacketManager* sent_packet_manager); - // Returns true if |packet_number| is a retransmission of a packet. static bool IsRetransmission(QuicSentPacketManager* sent_packet_manager, uint64_t packet_number);