Landing Recent QUIC changes until 01/26/2016 18:14 UTC

net/quic/quic_sent_packet_manager_test.cc

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();
 }