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

Unified Diff: net/socket/client_socket_pool_manager.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: merge 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
Index: net/socket/client_socket_pool_manager.cc
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index c053b1f4c0492d085014c6663e5bc5898d4c1efd..2e0671e9f1f0851fc599fdb58c5292435bb4010d 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -156,7 +156,6 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
new TransportSocketParams(
*proxy_host_port,
disable_resolver_cache,
- ignore_limits,
resolution_callback,
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT));
@@ -175,7 +174,6 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT;
proxy_tcp_params = new TransportSocketParams(*proxy_host_port,
disable_resolver_cache,
- ignore_limits,
resolution_callback,
combine_connect_and_write);
// Set ssl_params, and unset proxy_tcp_params
@@ -229,7 +227,6 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT;
ssl_tcp_params = new TransportSocketParams(origin_host_port,
disable_resolver_cache,
- ignore_limits,
resolution_callback,
combine_connect_and_write);
}
@@ -250,9 +247,8 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
return OK;
}
- return socket_handle->Init(connection_group, ssl_params,
- request_priority, callback, ssl_pool,
- net_log);
+ return socket_handle->Init(connection_group, ssl_params, request_priority,
+ ignore_limits, callback, ssl_pool, net_log);
}
// Finally, get the connection started.
@@ -267,8 +263,8 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
}
return socket_handle->Init(connection_group, http_proxy_params,
- request_priority, callback,
- pool, net_log);
+ request_priority, ignore_limits, callback, pool,
+ net_log);
}
if (proxy_info.is_socks()) {
@@ -280,9 +276,8 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
return OK;
}
- return socket_handle->Init(connection_group, socks_params,
- request_priority, callback, pool,
- net_log);
+ return socket_handle->Init(connection_group, socks_params, request_priority,
+ ignore_limits, callback, pool, net_log);
}
DCHECK(proxy_info.is_direct());
@@ -290,7 +285,6 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
new TransportSocketParams(
origin_host_port,
disable_resolver_cache,
- ignore_limits,
resolution_callback,
TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT);
TransportClientSocketPool* pool =
@@ -301,9 +295,8 @@ int InitSocketPoolHelper(ClientSocketPoolManager::SocketGroupType group_type,
return OK;
}
- return socket_handle->Init(connection_group, tcp_params,
- request_priority, callback,
- pool, net_log);
+ return socket_handle->Init(connection_group, tcp_params, request_priority,
+ ignore_limits, callback, pool, net_log);
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698