Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1067)

Unified Diff: net/quic/quic_sent_packet_manager_test.cc

Issue 1660533002: Landing Recent QUIC changes until 01/26/2016 18:14 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fd1b8a32781d5939b114f404a9ba0146fefa19cb..66222aa9ecc99dcfab4ec2c850a3206e0233513c 100644
--- a/net/quic/quic_sent_packet_manager_test.cc
+++ b/net/quic/quic_sent_packet_manager_test.cc
@@ -959,10 +959,6 @@ TEST_F(QuicSentPacketManagerTest, CryptoHandshakeTimeoutVersionNegotiation) {
RetransmitNextPacket(12);
EXPECT_FALSE(manager_.HasPendingRetransmissions());
- if (!FLAGS_quic_track_single_retransmission) {
- EXPECT_EQ(8u, manager_.GetLeastUnacked());
- return;
- }
EXPECT_EQ(1u, manager_.GetLeastUnacked());
// Least unacked isn't raised until an ack is received, so ack the
// crypto packets.
@@ -1407,12 +1403,7 @@ TEST_F(QuicSentPacketManagerTest, GetLossDelay) {
// Handle an ack which causes the loss algorithm to be evaluated and
// set the loss timeout.
ExpectAck(2);
- if (FLAGS_quic_general_loss_algorithm) {
- EXPECT_CALL(*loss_algorithm, DetectLosses(_, _, _, _));
- } else {
- EXPECT_CALL(*loss_algorithm, DetectLostPackets(_, _, _, _))
- .WillOnce(Return(PacketNumberSet()));
- }
+ EXPECT_CALL(*loss_algorithm, DetectLosses(_, _, _, _));
QuicAckFrame ack_frame;
ack_frame.largest_observed = 2;
ack_frame.missing_packets.Add(1);
@@ -1425,12 +1416,7 @@ TEST_F(QuicSentPacketManagerTest, GetLossDelay) {
// Fire the retransmission timeout and ensure the loss detection algorithm
// is invoked.
- if (FLAGS_quic_general_loss_algorithm) {
- EXPECT_CALL(*loss_algorithm, DetectLosses(_, _, _, _));
- } else {
- EXPECT_CALL(*loss_algorithm, DetectLostPackets(_, _, _, _))
- .WillOnce(Return(PacketNumberSet()));
- }
+ EXPECT_CALL(*loss_algorithm, DetectLosses(_, _, _, _));
manager_.OnRetransmissionTimeout();
}
« no previous file with comments | « net/quic/quic_sent_packet_manager.cc ('k') | net/quic/quic_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698