Deprecate FLAGS_quic_always_write_queued_retransmissions.

net/quic/quic_multipath_sent_packet_manager_test.cc

Index: net/quic/quic_multipath_sent_packet_manager_test.cc
diff --git a/net/quic/quic_multipath_sent_packet_manager_test.cc b/net/quic/quic_multipath_sent_packet_manager_test.cc
index cac96ea4b9463552c8331e4bd06c2d2af3997a4e..6dfce33a08199bdc2853dd468f66e61146a336a5 100644
--- a/net/quic/quic_multipath_sent_packet_manager_test.cc
+++ b/net/quic/quic_multipath_sent_packet_manager_test.cc
@@ -92,34 +92,6 @@ TEST_F(QuicMultipathSentPacketManagerTest, OnIncomingAck) {
   multipath_manager_.OnIncomingAck(frame3, QuicTime::Zero());
 }
 
-TEST_F(QuicMultipathSentPacketManagerTest, IsUnacked) {
-  EXPECT_CALL(*manager_0_, IsUnacked(kDefaultPathId, 1)).WillOnce(Return(true));
-  EXPECT_CALL(*manager_1_, IsUnacked(kTestPathId1, 2)).WillOnce(Return(false));
-  EXPECT_CALL(*manager_2_, IsUnacked(kTestPathId2, 3)).WillOnce(Return(true));
-  EXPECT_TRUE(multipath_manager_.IsUnacked(kDefaultPathId, 1));
-  EXPECT_FALSE(multipath_manager_.IsUnacked(kTestPathId1, 2));
-  EXPECT_TRUE(multipath_manager_.IsUnacked(kTestPathId2, 3));
-  /*
-  EXPECT_DFATAL(multipath_manager_.IsUnacked(kTestPathId3, 4), "");
-  */
-}
-
-TEST_F(QuicMultipathSentPacketManagerTest, HasRetransmittableFrames) {
-  EXPECT_CALL(*manager_0_, HasRetransmittableFrames(kDefaultPathId, 1))
-      .WillOnce(Return(true));
-  EXPECT_CALL(*manager_1_, HasRetransmittableFrames(kTestPathId1, 2))
-      .WillOnce(Return(false));
-  EXPECT_CALL(*manager_2_, HasRetransmittableFrames(kTestPathId2, 3))
-      .WillOnce(Return(true));
-  EXPECT_TRUE(multipath_manager_.HasRetransmittableFrames(kDefaultPathId, 1));
-  EXPECT_FALSE(multipath_manager_.HasRetransmittableFrames(kTestPathId1, 2));
-  EXPECT_TRUE(multipath_manager_.HasRetransmittableFrames(kTestPathId2, 3));
-  /*
-  EXPECT_DFATAL(multipath_manager_.HasRetransmittableFrames(kTestPathId3, 4),
-                "");
-  */
-}
-
 TEST_F(QuicMultipathSentPacketManagerTest, RetransmitUnackedPackets) {
   EXPECT_CALL(*manager_0_, RetransmitUnackedPackets(HANDSHAKE_RETRANSMISSION));
   multipath_manager_.RetransmitUnackedPackets(HANDSHAKE_RETRANSMISSION);
@@ -178,7 +150,7 @@ TEST_F(QuicMultipathSentPacketManagerTest, GetLeastUnacked) {
   EXPECT_EQ(2u, multipath_manager_.GetLeastUnacked(kDefaultPathId));
   EXPECT_EQ(3u, multipath_manager_.GetLeastUnacked(kTestPathId1));
   EXPECT_EQ(4u, multipath_manager_.GetLeastUnacked(kTestPathId2));
-  EXPECT_EQ(0u, multipath_manager_.GetLeastUnacked(kTestPathId3));
+  EXPECT_DFATAL(multipath_manager_.GetLeastUnacked(kTestPathId3), "");
 }
 
 TEST_F(QuicMultipathSentPacketManagerTest, OnPacketSent) {
@@ -303,7 +275,8 @@ TEST_F(QuicMultipathSentPacketManagerTest, OnConnectionMigration) {
   */
   EXPECT_CALL(delegate_,
               OnUnrecoverableError(QUIC_MULTIPATH_PATH_DOES_NOT_EXIST, _, _));
-  multipath_manager_.OnConnectionMigration(kTestPathId3, PORT_CHANGE);
+  EXPECT_DFATAL(
+      multipath_manager_.OnConnectionMigration(kTestPathId3, PORT_CHANGE), "");
 }
 
 TEST_F(QuicMultipathSentPacketManagerTest, IsHandshakeConfirmed) {
@@ -328,7 +301,7 @@ TEST_F(QuicMultipathSentPacketManagerTest, GetLargestObserved) {
   EXPECT_EQ(10u, multipath_manager_.GetLargestObserved(kDefaultPathId));
   EXPECT_EQ(11u, multipath_manager_.GetLargestObserved(kTestPathId1));
   EXPECT_EQ(12u, multipath_manager_.GetLargestObserved(kTestPathId2));
-  EXPECT_DFATAL(multipath_manager_.GetLargestObserved(kTestPathId3), "");
+  EXPECT_EQ(0u, multipath_manager_.GetLargestObserved(kTestPathId3));
 }
 
 TEST_F(QuicMultipathSentPacketManagerTest, GetLargestSentPacket) {
@@ -355,7 +328,8 @@ TEST_F(QuicMultipathSentPacketManagerTest, GetLeastPacketAwaitedByPeer) {
             multipath_manager_.GetLeastPacketAwaitedByPeer(kDefaultPathId));
   EXPECT_EQ(11u, multipath_manager_.GetLeastPacketAwaitedByPeer(kTestPathId1));
   EXPECT_EQ(12u, multipath_manager_.GetLeastPacketAwaitedByPeer(kTestPathId2));
-  EXPECT_EQ(0u, multipath_manager_.GetLeastPacketAwaitedByPeer(kTestPathId3));
+  EXPECT_DFATAL(multipath_manager_.GetLeastPacketAwaitedByPeer(kTestPathId3),
+                "");
 }
 
 TEST_F(QuicMultipathSentPacketManagerTest, SetNetworkChangeVisitor) {