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

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

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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/proxy/proxy_service_v8.cc ('k') | net/socket/deterministic_socket_data_unittest.cc » ('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 "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "net/base/ssl_config_service.h" 9 #include "net/base/ssl_config_service.h"
10 #include "net/http/http_proxy_client_socket_pool.h" 10 #include "net/http/http_proxy_client_socket_pool.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 &ssl_for_https_proxy_pool_histograms_, 286 &ssl_for_https_proxy_pool_histograms_,
287 host_resolver_, 287 host_resolver_,
288 cert_verifier_, 288 cert_verifier_,
289 server_bound_cert_service_, 289 server_bound_cert_service_,
290 transport_security_state_, 290 transport_security_state_,
291 ssl_session_cache_shard_, 291 ssl_session_cache_shard_,
292 socket_factory_, 292 socket_factory_,
293 tcp_https_ret.first->second /* https proxy */, 293 tcp_https_ret.first->second /* https proxy */,
294 NULL /* no socks proxy */, 294 NULL /* no socks proxy */,
295 NULL /* no http proxy */, 295 NULL /* no http proxy */,
296 ssl_config_service_, net_log_))); 296 ssl_config_service_.get(), net_log_)));
297 DCHECK(tcp_https_ret.second); 297 DCHECK(tcp_https_ret.second);
298 298
299 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = 299 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
300 http_proxy_socket_pools_.insert( 300 http_proxy_socket_pools_.insert(
301 std::make_pair( 301 std::make_pair(
302 http_proxy, 302 http_proxy,
303 new HttpProxyClientSocketPool( 303 new HttpProxyClientSocketPool(
304 max_sockets_per_proxy_server(pool_type_), 304 max_sockets_per_proxy_server(pool_type_),
305 max_sockets_per_group(pool_type_), 305 max_sockets_per_group(pool_type_),
306 &http_proxy_pool_histograms_, 306 &http_proxy_pool_histograms_,
(...skipping 18 matching lines...) Expand all
325 &ssl_pool_histograms_, 325 &ssl_pool_histograms_,
326 host_resolver_, 326 host_resolver_,
327 cert_verifier_, 327 cert_verifier_,
328 server_bound_cert_service_, 328 server_bound_cert_service_,
329 transport_security_state_, 329 transport_security_state_,
330 ssl_session_cache_shard_, 330 ssl_session_cache_shard_,
331 socket_factory_, 331 socket_factory_,
332 NULL, /* no tcp pool, we always go through a proxy */ 332 NULL, /* no tcp pool, we always go through a proxy */
333 GetSocketPoolForSOCKSProxy(proxy_server), 333 GetSocketPoolForSOCKSProxy(proxy_server),
334 GetSocketPoolForHTTPProxy(proxy_server), 334 GetSocketPoolForHTTPProxy(proxy_server),
335 ssl_config_service_, 335 ssl_config_service_.get(),
336 net_log_); 336 net_log_);
337 337
338 std::pair<SSLSocketPoolMap::iterator, bool> ret = 338 std::pair<SSLSocketPoolMap::iterator, bool> ret =
339 ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server, 339 ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server,
340 new_pool)); 340 new_pool));
341 341
342 return ret.first->second; 342 return ret.first->second;
343 } 343 }
344 344
345 Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const { 345 Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 // We should not flush the socket pools if we added trust to a 384 // We should not flush the socket pools if we added trust to a
385 // cert. 385 // cert.
386 // 386 //
387 // Since the OnCertTrustChanged method doesn't tell us what 387 // Since the OnCertTrustChanged method doesn't tell us what
388 // kind of trust change it is, we have to flush the socket 388 // kind of trust change it is, we have to flush the socket
389 // pools to be safe. 389 // pools to be safe.
390 FlushSocketPools(); 390 FlushSocketPools();
391 } 391 }
392 392
393 } // namespace net 393 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_service_v8.cc ('k') | net/socket/deterministic_socket_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698