fix packet conservation to remove packets from recovery window when they are lost. Protected by FL…

net/quic/core/congestion_control/bbr_sender_test.cc

Index: net/quic/core/congestion_control/bbr_sender_test.cc
diff --git a/net/quic/core/congestion_control/bbr_sender_test.cc b/net/quic/core/congestion_control/bbr_sender_test.cc
index a0d4b505d41791a6d6c971217732a80d463971d8..111bc24295f3ceb07b10f76d806c9dcdbf8436aa 100644
--- a/net/quic/core/congestion_control/bbr_sender_test.cc
+++ b/net/quic/core/congestion_control/bbr_sender_test.cc
@@ -97,7 +97,7 @@ class BbrSenderTest : public QuicTest {
     // TODO(ianswett): Determine why tests become flaky with CWND based on SRTT.
     FLAGS_quic_reloadable_flag_quic_bbr_base_cwnd_on_srtt = false;
     FLAGS_quic_reloadable_flag_quic_bbr_extra_conservation = true;
-    FLAGS_quic_reloadable_flag_quic_bbr_fix_conservation = true;
+    FLAGS_quic_reloadable_flag_quic_bbr_fix_conservation2 = true;
     rtt_stats_ = bbr_sender_.connection()->sent_packet_manager().GetRttStats();
     sender_ = SetupBbrSender(&bbr_sender_);
 
@@ -494,18 +494,12 @@ TEST_F(BbrSenderTest, RecoveryStates) {
   ASSERT_EQ(BbrSender::CONSERVATION,
             sender_->ExportDebugState().recovery_state);
 
-  const QuicByteCount cwnd_at_recovery_start = sender_->GetCongestionWindow();
   simulator_result = simulator_.RunUntilOrTimeout(
-      [this, cwnd_at_recovery_start]() {
-        // Ensure that the CWND never drops due to conservation.
-        if (sender_->GetCongestionWindow() < cwnd_at_recovery_start) {
-          return true;
-        }
+      [this]() {
         return sender_->ExportDebugState().recovery_state !=
                BbrSender::CONSERVATION;
       },
       timeout);
-  ASSERT_GE(sender_->GetCongestionWindow(), cwnd_at_recovery_start);
   ASSERT_TRUE(simulator_result);
   ASSERT_EQ(BbrSender::GROWTH, sender_->ExportDebugState().recovery_state);