Land Recent QUIC Changes.

net/quic/quic_client_session_test.cc

Index: net/quic/quic_client_session_test.cc
diff --git a/net/quic/quic_client_session_test.cc b/net/quic/quic_client_session_test.cc
index 8706d7cfb0e7999089e910b475d0966313eebf30..264fbfa52708d69cc545cc15640f6acd24c5a28e 100644
--- a/net/quic/quic_client_session_test.cc
+++ b/net/quic/quic_client_session_test.cc
@@ -33,8 +33,7 @@ const uint16 kServerPort = 80;
 
 class TestPacketWriter : public QuicDefaultPacketWriter {
  public:
-  TestPacketWriter(QuicVersion version) : version_(version) {
-  }
+  TestPacketWriter(QuicVersion version) : version_(version) {}
 
   // QuicPacketWriter
   virtual WriteResult WritePacket(
@@ -72,8 +71,7 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> {
                  make_scoped_ptr((QuicServerInfo*)NULL),
                  QuicServerId(kServerHostname, kServerPort, false,
                               PRIVACY_MODE_DISABLED),
-                 DefaultQuicConfig(), kInitialFlowControlWindowForTest,
-                 &crypto_config_,
+                 DefaultQuicConfig(), &crypto_config_,
                  base::MessageLoop::current()->message_loop_proxy().get(),
                  &net_log_) {
     session_.config()->SetDefaults();