Deprecate FLAGS_quic_drop_non_awaited_packets.

net/quic/quic_connection_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_connection.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 3499 matching lines @@
   // Don't send missing FEC packet 3.
   ASSERT_EQ(1u, connection_.NumFecGroups());
 
   // Now send non-fec protected ack packet and close the group.
   QuicPacketCreatorPeer::SetPacketNumber(&peer_creator_, 4);
   QuicStopWaitingFrame frame = InitStopWaitingFrame(5);
   ProcessStopWaitingPacket(&frame);
   ASSERT_EQ(0u, connection_.NumFecGroups());
 }
 
-TEST_P(QuicConnectionTest, FailedToCloseFecGroupWithFecProtectedStopWaiting) {
-  EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
-  ValueRestore<bool> old_flag(&FLAGS_quic_drop_non_awaited_packets, false);
-  // Don't send missing packet 1.
-  ProcessFecProtectedPacket(kDefaultPathId, 2, false, !kEntropyFlag,
-                            !kHasStopWaiting);
-  EXPECT_EQ(1u, connection_.NumFecGroups());
-  stop_waiting_ = InitStopWaitingFrame(3);
-  ProcessFecProtectedPacket(kDefaultPathId, 3, false, !kEntropyFlag,
-                            kHasStopWaiting);
-  // This Fec group would be closed but created again.
-  EXPECT_EQ(1u, connection_.NumFecGroups());
-}
-
 TEST_P(QuicConnectionTest,
        CloseFecGroupUnderStopWaitingAndWaitingForPacketsBelowStopWaiting) {
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
-  ValueRestore<bool> old_flag(&FLAGS_quic_drop_non_awaited_packets, true);
   // Don't send missing packet 1.
   ProcessFecProtectedPacket(kDefaultPathId, 2, false, !kEntropyFlag,
                             !kHasStopWaiting);
   EXPECT_EQ(1u, connection_.NumFecGroups());
   stop_waiting_ = InitStopWaitingFrame(2);
   ProcessFecProtectedPacket(kDefaultPathId, 3, false, !kEntropyFlag,
                             kHasStopWaiting);
   // This Fec group would be closed.
   EXPECT_EQ(0u, connection_.NumFecGroups());
 }
 
 TEST_P(QuicConnectionTest,
        DoNotCloseFecGroupUnderStopWaitingButNotWaitingForPacketsBelow) {
   EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
-  ValueRestore<bool> old_flag(&FLAGS_quic_drop_non_awaited_packets, true);
   ProcessFecProtectedPacket(kDefaultPathId, 1, false, !kEntropyFlag,
                             !kHasStopWaiting);
   ProcessFecProtectedPacket(kDefaultPathId, 2, false, !kEntropyFlag,
                             !kHasStopWaiting);
   // Don't send missing packet 3.
   EXPECT_EQ(1u, connection_.NumFecGroups());
   stop_waiting_ = InitStopWaitingFrame(2);
   ProcessFecProtectedPacket(kDefaultPathId, 3, false, !kEntropyFlag,
                             kHasStopWaiting);
   // This group will not be closed because this group is not waiting for packets
@@ skipping 1815 matching lines @@
             QuicPacketCreatorPeer::GetFecTimeout(creator_));
 }
 
 TEST_P(QuicConnectionTest, OnPacketHeaderDebugVisitor) {
   QuicPacketHeader header;
 
   scoped_ptr<MockQuicConnectionDebugVisitor> debug_visitor(
       new MockQuicConnectionDebugVisitor());
   connection_.set_debug_visitor(debug_visitor.get());
   EXPECT_CALL(*debug_visitor, OnPacketHeader(Ref(header))).Times(1);
-  if (FLAGS_quic_drop_non_awaited_packets) {
-    EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)).Times(1);
-    EXPECT_CALL(*debug_visitor, OnSuccessfulVersionNegotiation(_)).Times(1);
-  }
+  EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_)).Times(1);
+  EXPECT_CALL(*debug_visitor, OnSuccessfulVersionNegotiation(_)).Times(1);
   connection_.OnPacketHeader(header);
 }
 
 TEST_P(QuicConnectionTest, Pacing) {
   TestConnection server(connection_id_, kSelfAddress, helper_.get(),
                         writer_.get(), Perspective::IS_SERVER, version());
   TestConnection client(connection_id_, kPeerAddress, helper_.get(),
                         writer_.get(), Perspective::IS_CLIENT, version());
   EXPECT_FALSE(client.sent_packet_manager().using_pacing());
   EXPECT_FALSE(server.sent_packet_manager().using_pacing());
@@ skipping 212 matching lines @@
   // result in multiple attempts to close the connection - it will be marked as
   // disconnected after the first call.
   EXPECT_CALL(visitor_, OnConnectionClosed(_, _)).Times(1);
   connection_.SendConnectionCloseWithDetails(QUIC_NO_ERROR, "no reason");
   connection_.SendConnectionCloseWithDetails(QUIC_NO_ERROR, "no reason");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net