Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.cc

Index: net/tools/quic/quic_dispatcher.cc
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index b074a5df3befc4c38534e154e6c85f2f082e859c..df9b9c67f104a484b6d39d00c6410b7e121437f1 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -382,8 +382,8 @@ QuicSession* QuicDispatcher::CreateQuicSession(
       config_,
       CreateQuicConnection(connection_id,
                            server_address,
-                           client_address,
-                           initial_flow_control_window_bytes_),
+                           client_address),
+      initial_flow_control_window_bytes_,
       this);
   session->InitializeSession(crypto_config_);
   return session;
@@ -392,14 +392,12 @@ QuicSession* QuicDispatcher::CreateQuicSession(
 QuicConnection* QuicDispatcher::CreateQuicConnection(
     QuicConnectionId connection_id,
     const IPEndPoint& server_address,
-    const IPEndPoint& client_address,
-    uint32 initial_flow_control_window) {
+    const IPEndPoint& client_address) {
   if (FLAGS_enable_quic_stream_flow_control_2 &&
       FLAGS_enable_quic_connection_flow_control) {
     DLOG(INFO) << "Creating QuicDispatcher with all versions.";
     return new QuicConnection(connection_id, client_address, helper_.get(),
-                              writer_.get(), true, supported_versions_,
-                              initial_flow_control_window_bytes_);
+                              writer_.get(), true, supported_versions_);
   }
 
   if (FLAGS_enable_quic_stream_flow_control_2 &&
@@ -408,15 +406,14 @@ QuicConnection* QuicDispatcher::CreateQuicConnection(
                << "WITHOUT version 19 or higher.";
     return new QuicConnection(connection_id, client_address, helper_.get(),
                               writer_.get(), true,
-                              supported_versions_no_connection_flow_control_,
-                              initial_flow_control_window_bytes_);
+                              supported_versions_no_connection_flow_control_);
   }
 
   DLOG(INFO) << "Flow control disabled, creating QuicDispatcher WITHOUT "
              << "version 17 or higher.";
-  return new QuicConnection(
-      connection_id, client_address, helper_.get(), writer_.get(), true,
-      supported_versions_no_flow_control_, initial_flow_control_window_bytes_);
+  return new QuicConnection(connection_id, client_address, helper_.get(),
+                            writer_.get(), true,
+                            supported_versions_no_flow_control_);
 }
 
 QuicTimeWaitListManager* QuicDispatcher::CreateQuicTimeWaitListManager() {