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

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

Issue 9617039: Change Origin bound certs -> Domain bound certs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_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/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 timeout_ = max_transport_timeout + 441 timeout_ = max_transport_timeout +
442 base::TimeDelta::FromSeconds(kSSLHandshakeTimeoutInSeconds); 442 base::TimeDelta::FromSeconds(kSSLHandshakeTimeoutInSeconds);
443 } 443 }
444 444
445 SSLClientSocketPool::SSLClientSocketPool( 445 SSLClientSocketPool::SSLClientSocketPool(
446 int max_sockets, 446 int max_sockets,
447 int max_sockets_per_group, 447 int max_sockets_per_group,
448 ClientSocketPoolHistograms* histograms, 448 ClientSocketPoolHistograms* histograms,
449 HostResolver* host_resolver, 449 HostResolver* host_resolver,
450 CertVerifier* cert_verifier, 450 CertVerifier* cert_verifier,
451 OriginBoundCertService* origin_bound_cert_service, 451 ServerBoundCertService* server_bound_cert_service,
452 TransportSecurityState* transport_security_state, 452 TransportSecurityState* transport_security_state,
453 SSLHostInfoFactory* ssl_host_info_factory, 453 SSLHostInfoFactory* ssl_host_info_factory,
454 const std::string& ssl_session_cache_shard, 454 const std::string& ssl_session_cache_shard,
455 ClientSocketFactory* client_socket_factory, 455 ClientSocketFactory* client_socket_factory,
456 TransportClientSocketPool* transport_pool, 456 TransportClientSocketPool* transport_pool,
457 SOCKSClientSocketPool* socks_pool, 457 SOCKSClientSocketPool* socks_pool,
458 HttpProxyClientSocketPool* http_proxy_pool, 458 HttpProxyClientSocketPool* http_proxy_pool,
459 SSLConfigService* ssl_config_service, 459 SSLConfigService* ssl_config_service,
460 NetLog* net_log) 460 NetLog* net_log)
461 : transport_pool_(transport_pool), 461 : transport_pool_(transport_pool),
462 socks_pool_(socks_pool), 462 socks_pool_(socks_pool),
463 http_proxy_pool_(http_proxy_pool), 463 http_proxy_pool_(http_proxy_pool),
464 base_(max_sockets, max_sockets_per_group, histograms, 464 base_(max_sockets, max_sockets_per_group, histograms,
465 ClientSocketPool::unused_idle_socket_timeout(), 465 ClientSocketPool::unused_idle_socket_timeout(),
466 ClientSocketPool::used_idle_socket_timeout(), 466 ClientSocketPool::used_idle_socket_timeout(),
467 new SSLConnectJobFactory(transport_pool, 467 new SSLConnectJobFactory(transport_pool,
468 socks_pool, 468 socks_pool,
469 http_proxy_pool, 469 http_proxy_pool,
470 client_socket_factory, 470 client_socket_factory,
471 host_resolver, 471 host_resolver,
472 SSLClientSocketContext( 472 SSLClientSocketContext(
473 cert_verifier, 473 cert_verifier,
474 origin_bound_cert_service, 474 server_bound_cert_service,
475 transport_security_state, 475 transport_security_state,
476 ssl_host_info_factory, 476 ssl_host_info_factory,
477 ssl_session_cache_shard), 477 ssl_session_cache_shard),
478 net_log)), 478 net_log)),
479 ssl_config_service_(ssl_config_service) { 479 ssl_config_service_(ssl_config_service) {
480 if (ssl_config_service_) 480 if (ssl_config_service_)
481 ssl_config_service_->AddObserver(this); 481 ssl_config_service_->AddObserver(this);
482 } 482 }
483 483
484 SSLClientSocketPool::~SSLClientSocketPool() { 484 SSLClientSocketPool::~SSLClientSocketPool() {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 585
586 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { 586 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const {
587 return base_.histograms(); 587 return base_.histograms();
588 } 588 }
589 589
590 void SSLClientSocketPool::OnSSLConfigChanged() { 590 void SSLClientSocketPool::OnSSLConfigChanged() {
591 Flush(); 591 Flush();
592 } 592 }
593 593
594 } // namespace net 594 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_pool.h ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698