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

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

Issue 8944001: net: remove DNS certificate checking code. (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
« 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) 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 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 OriginBoundCertService* origin_bound_cert_service,
452 TransportSecurityState* transport_security_state, 452 TransportSecurityState* transport_security_state,
453 DnsCertProvenanceChecker* dns_cert_checker,
454 SSLHostInfoFactory* ssl_host_info_factory, 453 SSLHostInfoFactory* ssl_host_info_factory,
455 const std::string& ssl_session_cache_shard, 454 const std::string& ssl_session_cache_shard,
456 ClientSocketFactory* client_socket_factory, 455 ClientSocketFactory* client_socket_factory,
457 TransportClientSocketPool* transport_pool, 456 TransportClientSocketPool* transport_pool,
458 SOCKSClientSocketPool* socks_pool, 457 SOCKSClientSocketPool* socks_pool,
459 HttpProxyClientSocketPool* http_proxy_pool, 458 HttpProxyClientSocketPool* http_proxy_pool,
460 SSLConfigService* ssl_config_service, 459 SSLConfigService* ssl_config_service,
461 NetLog* net_log) 460 NetLog* net_log)
462 : transport_pool_(transport_pool), 461 : transport_pool_(transport_pool),
463 socks_pool_(socks_pool), 462 socks_pool_(socks_pool),
464 http_proxy_pool_(http_proxy_pool), 463 http_proxy_pool_(http_proxy_pool),
465 base_(max_sockets, max_sockets_per_group, histograms, 464 base_(max_sockets, max_sockets_per_group, histograms,
466 ClientSocketPool::unused_idle_socket_timeout(), 465 ClientSocketPool::unused_idle_socket_timeout(),
467 ClientSocketPool::used_idle_socket_timeout(), 466 ClientSocketPool::used_idle_socket_timeout(),
468 new SSLConnectJobFactory(transport_pool, 467 new SSLConnectJobFactory(transport_pool,
469 socks_pool, 468 socks_pool,
470 http_proxy_pool, 469 http_proxy_pool,
471 client_socket_factory, 470 client_socket_factory,
472 host_resolver, 471 host_resolver,
473 SSLClientSocketContext( 472 SSLClientSocketContext(
474 cert_verifier, 473 cert_verifier,
475 origin_bound_cert_service, 474 origin_bound_cert_service,
476 transport_security_state, 475 transport_security_state,
477 dns_cert_checker,
478 ssl_host_info_factory, 476 ssl_host_info_factory,
479 ssl_session_cache_shard), 477 ssl_session_cache_shard),
480 net_log)), 478 net_log)),
481 ssl_config_service_(ssl_config_service) { 479 ssl_config_service_(ssl_config_service) {
482 if (ssl_config_service_) 480 if (ssl_config_service_)
483 ssl_config_service_->AddObserver(this); 481 ssl_config_service_->AddObserver(this);
484 if (transport_pool_) 482 if (transport_pool_)
485 transport_pool_->AddLayeredPool(this); 483 transport_pool_->AddLayeredPool(this);
486 if (socks_pool_) 484 if (socks_pool_)
487 socks_pool_->AddLayeredPool(this); 485 socks_pool_->AddLayeredPool(this);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 Flush(); 618 Flush();
621 } 619 }
622 620
623 bool SSLClientSocketPool::CloseOneIdleConnection() { 621 bool SSLClientSocketPool::CloseOneIdleConnection() {
624 if (base_.CloseOneIdleSocket()) 622 if (base_.CloseOneIdleSocket())
625 return true; 623 return true;
626 return base_.CloseOneIdleConnectionInLayeredPool(); 624 return base_.CloseOneIdleConnectionInLayeredPool();
627 } 625 }
628 626
629 } // namespace net 627 } // 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