Land Recent QUIC Changes.

net/tools/quic/quic_client.cc

Index: net/tools/quic/quic_client.cc
diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc
index f2802a25334aa7beab15b552e8d7c93efc572742..1bee994cad51454bc60a35e81618173d6559c218 100644
--- a/net/tools/quic/quic_client.cc
+++ b/net/tools/quic/quic_client.cc
@@ -35,8 +35,7 @@ const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 QuicClient::QuicClient(IPEndPoint server_address,
                        const QuicServerId& server_id,
                        const QuicVersionVector& supported_versions,
-                       bool print_response,
-                       uint32 initial_flow_control_window)
+                       bool print_response)
     : server_address_(server_address),
       server_id_(server_id),
       local_port_(0),
@@ -46,16 +45,15 @@ QuicClient::QuicClient(IPEndPoint server_address,
       packets_dropped_(0),
       overflow_supported_(false),
       supported_versions_(supported_versions),
-      print_response_(print_response),
-      initial_flow_control_window_(initial_flow_control_window) {
+      print_response_(print_response) {
   config_.SetDefaults();
 }
 
 QuicClient::QuicClient(IPEndPoint server_address,
                        const QuicServerId& server_id,
-                       const QuicConfig& config,
                        const QuicVersionVector& supported_versions,
-                       uint32 initial_flow_control_window)
+                       bool print_response,
+                       const QuicConfig& config)
     : server_address_(server_address),
       server_id_(server_id),
       config_(config),
@@ -66,8 +64,7 @@ QuicClient::QuicClient(IPEndPoint server_address,
       packets_dropped_(0),
       overflow_supported_(false),
       supported_versions_(supported_versions),
-      print_response_(false),
-      initial_flow_control_window_(initial_flow_control_window) {
+      print_response_(print_response) {
 }
 
 QuicClient::~QuicClient() {
@@ -190,7 +187,6 @@ bool QuicClient::StartConnect() {
       config_,
       new QuicConnection(GenerateConnectionId(), server_address_, helper_.get(),
                          writer_.get(), false, supported_versions_),
-      initial_flow_control_window_,
       &crypto_config_));
   return session_->CryptoConnect();
 }
@@ -223,7 +219,7 @@ void QuicClient::SendRequestsAndWaitForResponse(
     stream->set_visitor(this);
   }
 
-  while (WaitForEvents()) { }
+  while (WaitForEvents()) {}
 }
 
 QuicSpdyClientStream* QuicClient::CreateReliableClientStream() {