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 9e556028df17d30a35ec62ed252d8a40bb0d76c0..22f80240894af28aad00e9a7948dc5b5095fa22c 100644
--- a/net/quic/quic_client_session_test.cc
+++ b/net/quic/quic_client_session_test.cc
@@ -22,6 +22,7 @@
 #include "net/socket/socket_test_util.h"
 #include "net/udp/datagram_client_socket.h"
 
+using net::test::kInitialFlowControlWindowForTest;

[wtc, 2014/05/19 18:58:40]

Nit: since the entire file is inside the net::test namespace, this using
statement isn't needed.

[ramant (doing other things), 2014/05/20 03:22:32]

Done.

 using testing::_;
 
 namespace net {
@@ -72,7 +73,8 @@ class QuicClientSessionTest : public ::testing::TestWithParam<QuicVersion> {
                  make_scoped_ptr((QuicServerInfo*)NULL),
                  QuicServerId(kServerHostname, kServerPort, false,
                               PRIVACY_MODE_DISABLED),
-                 DefaultQuicConfig(), &crypto_config_, &net_log_) {
+                 DefaultQuicConfig(), kInitialFlowControlWindowForTest,
+                 &crypto_config_, &net_log_) {
     session_.config()->SetDefaults();
     crypto_config_.SetDefaults();
   }