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

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 bc7a0ff7ba149e825c82af0e81cbaa63fa3b271a..cad6186c0c5e585195376627da0cbe8de3c3f248 100644
--- a/net/quic/core/congestion_control/bbr_sender_test.cc
+++ b/net/quic/core/congestion_control/bbr_sender_test.cc
@@ -640,7 +640,6 @@ TEST_F(BbrSenderTest, NoBandwidthDropOnStartup) {
 
 // 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;
@@ -673,7 +672,6 @@ TEST_F(BbrSenderTest, SimpleTransfer1RTTStartup) {
 
 // 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();