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

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

Issue 8857002: net: split the SSL session cache between incognito and normal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/metrics/field_trial.h" 7 #include "base/metrics/field_trial.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 SSLClientSocketPool::SSLClientSocketPool( 440 SSLClientSocketPool::SSLClientSocketPool(
441 int max_sockets, 441 int max_sockets,
442 int max_sockets_per_group, 442 int max_sockets_per_group,
443 ClientSocketPoolHistograms* histograms, 443 ClientSocketPoolHistograms* histograms,
444 HostResolver* host_resolver, 444 HostResolver* host_resolver,
445 CertVerifier* cert_verifier, 445 CertVerifier* cert_verifier,
446 OriginBoundCertService* origin_bound_cert_service, 446 OriginBoundCertService* origin_bound_cert_service,
447 TransportSecurityState* transport_security_state, 447 TransportSecurityState* transport_security_state,
448 DnsCertProvenanceChecker* dns_cert_checker, 448 DnsCertProvenanceChecker* dns_cert_checker,
449 SSLHostInfoFactory* ssl_host_info_factory, 449 SSLHostInfoFactory* ssl_host_info_factory,
450 const std::string& session_cache_shard,
450 ClientSocketFactory* client_socket_factory, 451 ClientSocketFactory* client_socket_factory,
451 TransportClientSocketPool* transport_pool, 452 TransportClientSocketPool* transport_pool,
452 SOCKSClientSocketPool* socks_pool, 453 SOCKSClientSocketPool* socks_pool,
453 HttpProxyClientSocketPool* http_proxy_pool, 454 HttpProxyClientSocketPool* http_proxy_pool,
454 SSLConfigService* ssl_config_service, 455 SSLConfigService* ssl_config_service,
455 NetLog* net_log) 456 NetLog* net_log)
456 : transport_pool_(transport_pool), 457 : transport_pool_(transport_pool),
457 socks_pool_(socks_pool), 458 socks_pool_(socks_pool),
458 http_proxy_pool_(http_proxy_pool), 459 http_proxy_pool_(http_proxy_pool),
459 base_(max_sockets, max_sockets_per_group, histograms, 460 base_(max_sockets, max_sockets_per_group, histograms,
460 ClientSocketPool::unused_idle_socket_timeout(), 461 ClientSocketPool::unused_idle_socket_timeout(),
461 ClientSocketPool::used_idle_socket_timeout(), 462 ClientSocketPool::used_idle_socket_timeout(),
462 new SSLConnectJobFactory(transport_pool, 463 new SSLConnectJobFactory(transport_pool,
463 socks_pool, 464 socks_pool,
464 http_proxy_pool, 465 http_proxy_pool,
465 client_socket_factory, 466 client_socket_factory,
466 host_resolver, 467 host_resolver,
467 SSLClientSocketContext( 468 SSLClientSocketContext(
468 cert_verifier, 469 cert_verifier,
469 origin_bound_cert_service, 470 origin_bound_cert_service,
470 transport_security_state, 471 transport_security_state,
471 dns_cert_checker, 472 dns_cert_checker,
472 ssl_host_info_factory), 473 ssl_host_info_factory,
474 session_cache_shard),
473 net_log)), 475 net_log)),
474 ssl_config_service_(ssl_config_service) { 476 ssl_config_service_(ssl_config_service) {
475 if (ssl_config_service_) 477 if (ssl_config_service_)
476 ssl_config_service_->AddObserver(this); 478 ssl_config_service_->AddObserver(this);
477 if (transport_pool_) 479 if (transport_pool_)
478 transport_pool_->AddLayeredPool(this); 480 transport_pool_->AddLayeredPool(this);
479 if (socks_pool_) 481 if (socks_pool_)
480 socks_pool_->AddLayeredPool(this); 482 socks_pool_->AddLayeredPool(this);
481 if (http_proxy_pool_) 483 if (http_proxy_pool_)
482 http_proxy_pool_->AddLayeredPool(this); 484 http_proxy_pool_->AddLayeredPool(this);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 Flush(); 615 Flush();
614 } 616 }
615 617
616 bool SSLClientSocketPool::CloseOneIdleConnection() { 618 bool SSLClientSocketPool::CloseOneIdleConnection() {
617 if (base_.CloseOneIdleSocket()) 619 if (base_.CloseOneIdleSocket())
618 return true; 620 return true;
619 return base_.CloseOneIdleConnectionInLayeredPool(); 621 return base_.CloseOneIdleConnectionInLayeredPool();
620 } 622 }
621 623
622 } // namespace net 624 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698