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

Side by Side Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 2229393003: net: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('k') | net/spdy/http2_write_scheduler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/client_socket_pool_manager_impl.h" 5 #include "net/socket/client_socket_pool_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 } 205 }
206 206
207 SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSSLSocketPool() { 207 SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSSLSocketPool() {
208 return ssl_socket_pool_.get(); 208 return ssl_socket_pool_.get();
209 } 209 }
210 210
211 SOCKSClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSOCKSProxy( 211 SOCKSClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSOCKSProxy(
212 const HostPortPair& socks_proxy) { 212 const HostPortPair& socks_proxy) {
213 SOCKSSocketPoolMap::const_iterator it = socks_socket_pools_.find(socks_proxy); 213 SOCKSSocketPoolMap::const_iterator it = socks_socket_pools_.find(socks_proxy);
214 if (it != socks_socket_pools_.end()) { 214 if (it != socks_socket_pools_.end()) {
215 DCHECK(ContainsKey(transport_socket_pools_for_socks_proxies_, socks_proxy)); 215 DCHECK(base::ContainsKey(transport_socket_pools_for_socks_proxies_,
216 socks_proxy));
216 return it->second; 217 return it->second;
217 } 218 }
218 219
219 DCHECK(!ContainsKey(transport_socket_pools_for_socks_proxies_, socks_proxy)); 220 DCHECK(!base::ContainsKey(transport_socket_pools_for_socks_proxies_,
221 socks_proxy));
220 int sockets_per_proxy_server = max_sockets_per_proxy_server(pool_type_); 222 int sockets_per_proxy_server = max_sockets_per_proxy_server(pool_type_);
221 int sockets_per_group = std::min(sockets_per_proxy_server, 223 int sockets_per_group = std::min(sockets_per_proxy_server,
222 max_sockets_per_group(pool_type_)); 224 max_sockets_per_group(pool_type_));
223 225
224 std::pair<TransportSocketPoolMap::iterator, bool> tcp_ret = 226 std::pair<TransportSocketPoolMap::iterator, bool> tcp_ret =
225 transport_socket_pools_for_socks_proxies_.insert(std::make_pair( 227 transport_socket_pools_for_socks_proxies_.insert(std::make_pair(
226 socks_proxy, 228 socks_proxy,
227 new TransportClientSocketPool(sockets_per_proxy_server, 229 new TransportClientSocketPool(sockets_per_proxy_server,
228 sockets_per_group, host_resolver_, 230 sockets_per_group, host_resolver_,
229 socket_factory_, nullptr, net_log_))); 231 socket_factory_, nullptr, net_log_)));
230 DCHECK(tcp_ret.second); 232 DCHECK(tcp_ret.second);
231 233
232 std::pair<SOCKSSocketPoolMap::iterator, bool> ret = 234 std::pair<SOCKSSocketPoolMap::iterator, bool> ret =
233 socks_socket_pools_.insert(std::make_pair( 235 socks_socket_pools_.insert(std::make_pair(
234 socks_proxy, 236 socks_proxy,
235 new SOCKSClientSocketPool(sockets_per_proxy_server, sockets_per_group, 237 new SOCKSClientSocketPool(sockets_per_proxy_server, sockets_per_group,
236 host_resolver_, tcp_ret.first->second, 238 host_resolver_, tcp_ret.first->second,
237 nullptr, net_log_))); 239 nullptr, net_log_)));
238 240
239 return ret.first->second; 241 return ret.first->second;
240 } 242 }
241 243
242 HttpProxyClientSocketPool* 244 HttpProxyClientSocketPool*
243 ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy( 245 ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
244 const HostPortPair& http_proxy) { 246 const HostPortPair& http_proxy) {
245 HTTPProxySocketPoolMap::const_iterator it = 247 HTTPProxySocketPoolMap::const_iterator it =
246 http_proxy_socket_pools_.find(http_proxy); 248 http_proxy_socket_pools_.find(http_proxy);
247 if (it != http_proxy_socket_pools_.end()) { 249 if (it != http_proxy_socket_pools_.end()) {
248 DCHECK(ContainsKey(transport_socket_pools_for_http_proxies_, http_proxy)); 250 DCHECK(base::ContainsKey(transport_socket_pools_for_http_proxies_,
249 DCHECK(ContainsKey(transport_socket_pools_for_https_proxies_, http_proxy)); 251 http_proxy));
250 DCHECK(ContainsKey(ssl_socket_pools_for_https_proxies_, http_proxy)); 252 DCHECK(base::ContainsKey(transport_socket_pools_for_https_proxies_,
253 http_proxy));
254 DCHECK(base::ContainsKey(ssl_socket_pools_for_https_proxies_, http_proxy));
251 return it->second; 255 return it->second;
252 } 256 }
253 257
254 DCHECK(!ContainsKey(transport_socket_pools_for_http_proxies_, http_proxy)); 258 DCHECK(
255 DCHECK(!ContainsKey(transport_socket_pools_for_https_proxies_, http_proxy)); 259 !base::ContainsKey(transport_socket_pools_for_http_proxies_, http_proxy));
256 DCHECK(!ContainsKey(ssl_socket_pools_for_https_proxies_, http_proxy)); 260 DCHECK(!base::ContainsKey(transport_socket_pools_for_https_proxies_,
261 http_proxy));
262 DCHECK(!base::ContainsKey(ssl_socket_pools_for_https_proxies_, http_proxy));
257 263
258 int sockets_per_proxy_server = max_sockets_per_proxy_server(pool_type_); 264 int sockets_per_proxy_server = max_sockets_per_proxy_server(pool_type_);
259 int sockets_per_group = std::min(sockets_per_proxy_server, 265 int sockets_per_group = std::min(sockets_per_proxy_server,
260 max_sockets_per_group(pool_type_)); 266 max_sockets_per_group(pool_type_));
261 267
262 std::pair<TransportSocketPoolMap::iterator, bool> tcp_http_ret = 268 std::pair<TransportSocketPoolMap::iterator, bool> tcp_http_ret =
263 transport_socket_pools_for_http_proxies_.insert(std::make_pair( 269 transport_socket_pools_for_http_proxies_.insert(std::make_pair(
264 http_proxy, 270 http_proxy,
265 new TransportClientSocketPool( 271 new TransportClientSocketPool(
266 sockets_per_proxy_server, sockets_per_group, host_resolver_, 272 sockets_per_proxy_server, sockets_per_group, host_resolver_,
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 // We should not flush the socket pools if we added trust to a 373 // We should not flush the socket pools if we added trust to a
368 // cert. 374 // cert.
369 // 375 //
370 // Since the OnCACertChanged method doesn't tell us what 376 // Since the OnCACertChanged method doesn't tell us what
371 // kind of change it is, we have to flush the socket 377 // kind of change it is, we have to flush the socket
372 // pools to be safe. 378 // pools to be safe.
373 FlushSocketPoolsWithError(ERR_NETWORK_CHANGED); 379 FlushSocketPoolsWithError(ERR_NETWORK_CHANGED);
374 } 380 }
375 381
376 } // namespace net 382 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('k') | net/spdy/http2_write_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698