Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher_test.cc

 // Copyright (c) 2012 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/tools/quic/quic_dispatcher.h"
 
 #include <string>
 
 #include "base/strings/string_piece.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_packet_writer_wrapper.h"
 #include "net/tools/quic/quic_time_wait_list_manager.h"
 #include "net/tools/quic/test_tools/quic_dispatcher_peer.h"
 #include "net/tools/quic/test_tools/quic_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPiece;
 using net::EpollServer;
+using net::test::ConstructEncryptedPacket;
 using net::test::MockSession;
-using net::test::ConstructEncryptedPacket;
+using net::test::ValueRestore;
 using net::tools::test::MockConnection;
 using std::make_pair;
+using testing::DoAll;
+using testing::InSequence;
+using testing::Invoke;
+using testing::WithoutArgs;
 using testing::_;
-using testing::DoAll;
-using testing::Invoke;
-using testing::InSequence;
-using testing::WithoutArgs;
 
 namespace net {
 namespace tools {
 namespace test {
 namespace {
 
 class TestDispatcher : public QuicDispatcher {
  public:
   explicit TestDispatcher(const QuicConfig& config,
                           const QuicCryptoServerConfig& crypto_config,
                           EpollServer* eps)
       : QuicDispatcher(config,
                        crypto_config,
                        QuicSupportedVersions(),
-                       eps,
-                       kInitialFlowControlWindowForTest) {
+                       eps) {
   }
 
   MOCK_METHOD3(CreateQuicSession, QuicSession*(
       QuicConnectionId connection_id,
       const IPEndPoint& server_address,
       const IPEndPoint& client_address));
   using QuicDispatcher::write_blocked_list;
 
   using QuicDispatcher::current_server_address;
   using QuicDispatcher::current_client_address;
@@ skipping 214 matching lines @@
   QuicConnectionId kCID = 1234;
 
   QuicVersion kTestQuicVersions[] = {QUIC_VERSION_17,
                                      QUIC_VERSION_16,
                                      QUIC_VERSION_15};
   QuicVersionVector kTestVersions;
   for (size_t i = 0; i < arraysize(kTestQuicVersions); ++i) {
     kTestVersions.push_back(kTestQuicVersions[i]);
   }
 
-  QuicDispatcher dispatcher(config, server_config, kTestVersions, &eps,
-                            kInitialFlowControlWindowForTest);
+  QuicDispatcher dispatcher(config, server_config, kTestVersions, &eps);
   dispatcher.Initialize(0);
 
   // When flag is enabled, new connections should support QUIC_VERSION_17.
-  FLAGS_enable_quic_stream_flow_control_2 = true;
+  ValueRestore<bool> old_flag(&FLAGS_enable_quic_stream_flow_control_2, true);
   scoped_ptr<QuicConnection> connection_1(
       QuicDispatcherPeer::CreateQuicConnection(&dispatcher, kCID, client,
                                                server));
   EXPECT_EQ(QUIC_VERSION_17, connection_1->version());
 
 
   // When flag is disabled, new connections should not support QUIC_VERSION_17.
   FLAGS_enable_quic_stream_flow_control_2 = false;
   scoped_ptr<QuicConnection> connection_2(
       QuicDispatcherPeer::CreateQuicConnection(&dispatcher, kCID, client,
@@ skipping 192 matching lines @@
   // And we'll resume where we left off when we get another call.
   EXPECT_CALL(*connection2(), OnCanWrite());
   dispatcher_.OnCanWrite();
   EXPECT_FALSE(dispatcher_.HasPendingWrites());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net