SPDY - Added SETTINGS_MAX_CONCURRENT_STREAMS:1000 in the initial SETTINGS frame,

so the server can push effectively as many streams as it wants to.

- Send along SETTINGS_MAX_CONCURRENT_STREAMS for SPDY versions 2 and higher.
- Avoid sending the Settings frame for every unit tests.

R=willchan
BUG=132341
TEST=netowrk unit tests
Review URL: https://chromiumcodereview.appspot.com/10536136

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142265 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 22 insertions, 4 deletions

diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
index 838c54f..eb3a80f 100644
--- a/net/http/http_network_transaction_spdy2_unittest.cc
+++ b/net/http/http_network_transaction_spdy2_unittest.cc
@@ -179,7 +179,10 @@ HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
   params.http_server_properties = &session_deps->http_server_properties;
   params.net_log = session_deps->net_log;
   params.trusted_spdy_proxy = session_deps->trusted_spdy_proxy;
-  return new HttpNetworkSession(params);
+  HttpNetworkSession* http_session = new HttpNetworkSession(params);
+  SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool());
+  pool_peer.EnableSendingInitialSettings(false);
+  return http_session;
 }
 
 }  // namespace
@@ -9424,6 +9427,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, MAYBE_UseIPConnectionPooling) {
   scoped_refptr<HttpNetworkSession> session(new HttpNetworkSession(params));
   SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
   pool_peer.DisableDomainAuthenticationVerification();
+  pool_peer.EnableSendingInitialSettings(false);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(kProtoSPDY2);
@@ -9534,6 +9538,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test, UseIPConnectionPoolingAfterResolution) {
   scoped_refptr<HttpNetworkSession> session(new HttpNetworkSession(params));
   SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
   pool_peer.DisableDomainAuthenticationVerification();
+  pool_peer.EnableSendingInitialSettings(false);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(kProtoSPDY2);
@@ -9680,6 +9685,7 @@ TEST_F(HttpNetworkTransactionSpdy2Test,
   scoped_refptr<HttpNetworkSession> session(new HttpNetworkSession(params));
   SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
   pool_peer.DisableDomainAuthenticationVerification();
+  pool_peer.EnableSendingInitialSettings(false);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(kProtoSPDY2);
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index 84bd7d3..36f0b2b 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc
@@ -164,7 +164,10 @@ HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
   params.http_server_properties = &session_deps->http_server_properties;
   params.net_log = session_deps->net_log;
   params.trusted_spdy_proxy = session_deps->trusted_spdy_proxy;
-  return new HttpNetworkSession(params);
+  HttpNetworkSession* http_session = new HttpNetworkSession(params);
+  SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool());
+  pool_peer.EnableSendingInitialSettings(false);
+  return http_session;
 }
 
 // Takes in a Value created from a NetLogHttpResponseParameter, and returns
@@ -9416,6 +9419,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, UseIPConnectionPooling) {
   scoped_refptr<HttpNetworkSession> session(new HttpNetworkSession(params));
   SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
   pool_peer.DisableDomainAuthenticationVerification();
+  pool_peer.EnableSendingInitialSettings(false);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(kProtoSPDY3);
@@ -9525,6 +9529,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test, UseIPConnectionPoolingAfterResolution) {
   scoped_refptr<HttpNetworkSession> session(new HttpNetworkSession(params));
   SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
   pool_peer.DisableDomainAuthenticationVerification();
+  pool_peer.EnableSendingInitialSettings(false);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(kProtoSPDY3);
@@ -9665,6 +9670,7 @@ TEST_F(HttpNetworkTransactionSpdy3Test,
   scoped_refptr<HttpNetworkSession> session(new HttpNetworkSession(params));
   SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
   pool_peer.DisableDomainAuthenticationVerification();
+  pool_peer.EnableSendingInitialSettings(false);
 
   SSLSocketDataProvider ssl(ASYNC, OK);
   ssl.SetNextProto(kProtoSPDY3);
diff --git a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
index 5f7a8e0..6bd4ce7 100644
--- a/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_spdy2_unittest.cc
@@ -189,7 +189,10 @@ class HttpProxyClientSocketPoolSpdy2Test : public TestWithHttpParam {
     params.ssl_config_service = ssl_config_service_;
     params.http_auth_handler_factory = http_auth_handler_factory_.get();
     params.http_server_properties = &http_server_properties_;
-    return new HttpNetworkSession(params);
+    HttpNetworkSession* session = new HttpNetworkSession(params);
+    SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
+    pool_peer.EnableSendingInitialSettings(false);
+    return session;
   }
 
  private:
diff --git a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc
index bc0c62a..9d13298 100644
--- a/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_spdy3_unittest.cc
@@ -189,7 +189,10 @@ class HttpProxyClientSocketPoolSpdy3Test : public TestWithHttpParam {
     params.ssl_config_service = ssl_config_service_;
     params.http_auth_handler_factory = http_auth_handler_factory_.get();
     params.http_server_properties = &http_server_properties_;
-    return new HttpNetworkSession(params);
+    HttpNetworkSession* session = new HttpNetworkSession(params);
+    SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
+    pool_peer.EnableSendingInitialSettings(false);
+    return session;
   }
 
  private: