Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc

Index: net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc
diff --git a/net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc b/net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc
index 9c33e1d467166c63bf0204e8e13f5d2c2a59dc93..6415172fc47ac7365baca1059e33e30c0d3f1c1f 100644
--- a/net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc
+++ b/net/quic/congestion_control/tcp_cubic_sender_bytes_test.cc
@@ -232,7 +232,6 @@ TEST_F(TcpCubicSenderBytesTest, SlowStartPacketLoss) {
 }
 
 TEST_F(TcpCubicSenderBytesTest, SlowStartPacketLossWithLargeReduction) {
-  FLAGS_quic_sslr_limit_reduction = true;
   QuicConfig config;
   QuicTagVector options;
   options.push_back(kSSLR);
@@ -327,7 +326,6 @@ TEST_F(TcpCubicSenderBytesTest, SlowStartHalfPacketLossWithLargeReduction) {
 }
 
 TEST_F(TcpCubicSenderBytesTest, SlowStartPacketLossWithMaxHalfReduction) {
-  FLAGS_quic_sslr_limit_reduction = true;
   QuicConfig config;
   QuicTagVector options;
   options.push_back(kSSLR);
@@ -876,7 +874,6 @@ TEST_F(TcpCubicSenderBytesTest, ResetAfterConnectionMigration) {
 }
 
 TEST_F(TcpCubicSenderBytesTest, DefaultMaxCwnd) {
-  ValueRestore<bool> old_flag(&FLAGS_quic_ignore_srbf, true);
   RttStats rtt_stats;
   QuicConnectionStats stats;
   std::unique_ptr<SendAlgorithmInterface> sender(SendAlgorithmInterface::Create(