Land Recent QUIC Changes.

net/quic/quic_flow_controller_test.cc

 // Copyright 2014 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_flow_controller.h"
 
 #include "base/strings/stringprintf.h"
-#include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
 #include "net/quic/test_tools/quic_flow_controller_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::StringPrintf;
 
 namespace net {
 namespace test {
 
 using ::testing::_;
 
 class QuicFlowControllerTest : public ::testing::Test {
  public:
   QuicFlowControllerTest()
       : stream_id_(1234),
         send_window_(kInitialSessionFlowControlWindowForTest),
         receive_window_(kInitialSessionFlowControlWindowForTest),
         max_receive_window_(kInitialSessionFlowControlWindowForTest),
-        connection_(false),
-        old_flag_(&FLAGS_enable_quic_stream_flow_control_2, true) {
+        connection_(false) {
   }
 
   void Initialize() {
     flow_controller_.reset(new QuicFlowController(
         &connection_, stream_id_, false, send_window_,
         receive_window_, max_receive_window_));
   }
 
  protected:
   QuicStreamId stream_id_;
   uint64 send_window_;
   uint64 receive_window_;
   uint64 max_receive_window_;
   scoped_ptr<QuicFlowController> flow_controller_;
   MockConnection connection_;
-  ValueRestore<bool> old_flag_;
 };
 
 TEST_F(QuicFlowControllerTest, SendingBytes) {
   Initialize();
 
   EXPECT_TRUE(flow_controller_->IsEnabled());
   EXPECT_FALSE(flow_controller_->IsBlocked());
   EXPECT_FALSE(flow_controller_->FlowControlViolation());
   EXPECT_EQ(send_window_, flow_controller_->SendWindowSize());
 
@@ skipping 157 matching lines @@
   flow_controller_->AddBytesSent(send_window_);
   EXPECT_TRUE(flow_controller_->IsBlocked());
   EXPECT_EQ(0u, flow_controller_->SendWindowSize());
 
   // BLOCKED frame should get sent as send offset has changed.
   flow_controller_->MaybeSendBlocked();
 }
 
 }  // namespace test
 }  // namespace net