Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Unified Diff: net/spdy/spdy_test_util_common.cc

Issue 1580903002: Convert ignore_limits from a SocketParam to a socket request argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: RespectLimits Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_session_unittest.cc ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_test_util_common.cc
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 6a2879480215d37315b1cfd4f48546f911d3f846..6802c397e0cc2fc7b4cc6f28e65a713a6d92c941 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -500,7 +500,7 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper(
scoped_refptr<TransportSocketParams> transport_params(
new TransportSocketParams(
- key.host_port_pair(), false, false, OnHostResolutionCallback(),
+ key.host_port_pair(), false, OnHostResolutionCallback(),
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
@@ -518,17 +518,14 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper(
key.privacy_mode(),
0,
false));
- rv = connection->Init(key.host_port_pair().ToString(),
- ssl_params,
- MEDIUM,
- callback.callback(),
- http_session->GetSSLSocketPool(
- HttpNetworkSession::NORMAL_SOCKET_POOL),
- net_log);
+ rv = connection->Init(
+ key.host_port_pair().ToString(), ssl_params, MEDIUM,
+ ClientSocketPool::RespectLimits::ENABLED, callback.callback(),
+ http_session->GetSSLSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL),
+ net_log);
} else {
- rv = connection->Init(key.host_port_pair().ToString(),
- transport_params,
- MEDIUM,
+ rv = connection->Init(key.host_port_pair().ToString(), transport_params,
+ MEDIUM, ClientSocketPool::RespectLimits::ENABLED,
callback.callback(),
http_session->GetTransportSocketPool(
HttpNetworkSession::NORMAL_SOCKET_POOL),
« no previous file with comments | « net/spdy/spdy_session_unittest.cc ('k') | net/websockets/websocket_basic_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698