Land Recent QUIC Changes.

net/quic/quic_stream_factory.cc

Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 310f93e964a96b967ac6f462a588bab4f13944bb..b94b19b78fb628c47e56d8cbd6dad212303295aa 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -736,7 +736,7 @@ int QuicStreamFactory::CreateSession(
 
   QuicConnection* connection =
       new QuicConnection(connection_id, addr, helper_.get(), writer.get(),
-                         false, supported_versions_, kInitialReceiveWindowSize);
+                         false, supported_versions_);
   writer->SetConnection(connection);
   connection->options()->max_packet_length = max_packet_length_;
 
@@ -755,7 +755,7 @@ int QuicStreamFactory::CreateSession(
   *session = new QuicClientSession(
       connection, socket.Pass(), writer.Pass(), this,
       quic_crypto_client_stream_factory_, server_info.Pass(), server_id,
-      config, &crypto_config_, net_log.net_log());
+      config, kInitialReceiveWindowSize, &crypto_config_, net_log.net_log());
   all_sessions_[*session] = server_id;  // owning pointer
   return OK;
 }