Landing Recent QUIC changes until Fri May 12 18:23:26 2017 +0000

net/quic/core/congestion_control/bbr_sender_test.cc

 // Copyright 2016 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/core/congestion_control/bbr_sender.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 
@@ skipping 622 matching lines @@
   // Send another packet.
   bbr_sender_.AddBytesToTransfer(1000);
   simulator_result = simulator_.RunUntilOrTimeout(
       [this]() { return receiver_.bytes_received() == 2000; }, timeout);
   ASSERT_TRUE(simulator_result);
   EXPECT_GE(sender_->PacingRate(0), initial_rate);
 }
 
 // Test exiting STARTUP earlier due to the 1RTT connection option.
 TEST_F(BbrSenderTest, SimpleTransfer1RTTStartup) {
-  FLAGS_quic_reloadable_flag_quic_allow_2_rtt_bbr_startup = true;
   CreateDefaultSetup();
 
   QuicConfig config;
   QuicTagVector options;
   options.push_back(k1RTT);
   QuicConfigPeer::SetReceivedConnectionOptions(&config, options);
   sender_->SetFromConfig(config, Perspective::IS_SERVER);
   EXPECT_EQ(1u, sender_->num_startup_rtts());
 
   // Run until the full bandwidth is reached and check how many rounds it was.
@@ skipping 12 matching lines @@
   ASSERT_TRUE(simulator_result);
   EXPECT_EQ(BbrSender::DRAIN, sender_->ExportDebugState().mode);
   EXPECT_EQ(1u, sender_->ExportDebugState().round_trip_count - max_bw_round);
   EXPECT_EQ(1u, sender_->ExportDebugState().rounds_without_bandwidth_gain);
   EXPECT_EQ(0u, bbr_sender_.connection()->GetStats().packets_lost);
   EXPECT_FALSE(sender_->ExportDebugState().last_sample_is_app_limited);
 }
 
 // Test exiting STARTUP earlier due to the 2RTT connection option.
 TEST_F(BbrSenderTest, SimpleTransfer2RTTStartup) {
-  FLAGS_quic_reloadable_flag_quic_allow_2_rtt_bbr_startup = true;
   // Adding TSO CWND causes packet loss before exiting startup.
   FLAGS_quic_reloadable_flag_quic_bbr_add_tso_cwnd = false;
   CreateDefaultSetup();
 
   QuicConfig config;
   QuicTagVector options;
   options.push_back(k2RTT);
   QuicConfigPeer::SetReceivedConnectionOptions(&config, options);
   sender_->SetFromConfig(config, Perspective::IS_SERVER);
   EXPECT_EQ(2u, sender_->num_startup_rtts());
@@ skipping 58 matching lines @@
   sender_->ResumeConnectionState(params, false);
   EXPECT_EQ(kTestLinkBandwidth, sender_->ExportDebugState().max_bandwidth);
   EXPECT_EQ(kTestLinkBandwidth, sender_->BandwidthEstimate());
   ExpectApproxEq(kTestRtt, sender_->ExportDebugState().min_rtt, 0.01f);
 
   DriveOutOfStartup();
 }
 
 }  // namespace test
 }  // namespace net