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

Unified Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 1579233002: Rename CertPolicyEnforcer to CTPolicyEnforcer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/ssl_client_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_manager_impl.cc
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index 6917036caa643213d85ead360dc645e74a2383c7..f2d512c2a91fabd4109958e7443586e9c4ebb93a 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -45,7 +45,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
ChannelIDService* channel_id_service,
TransportSecurityState* transport_security_state,
CTVerifier* cert_transparency_verifier,
- CertPolicyEnforcer* cert_policy_enforcer,
+ CTPolicyEnforcer* ct_policy_enforcer,
const std::string& ssl_session_cache_shard,
SSLConfigService* ssl_config_service,
HttpNetworkSession::SocketPoolType pool_type)
@@ -56,7 +56,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
channel_id_service_(channel_id_service),
transport_security_state_(transport_security_state),
cert_transparency_verifier_(cert_transparency_verifier),
- cert_policy_enforcer_(cert_policy_enforcer),
+ ct_policy_enforcer_(ct_policy_enforcer),
ssl_session_cache_shard_(ssl_session_cache_shard),
ssl_config_service_(ssl_config_service),
pool_type_(pool_type),
@@ -79,7 +79,7 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
channel_id_service,
transport_security_state,
cert_transparency_verifier,
- cert_policy_enforcer,
+ ct_policy_enforcer,
ssl_session_cache_shard,
socket_factory,
transport_socket_pool_.get(),
@@ -285,15 +285,15 @@ ClientSocketPoolManagerImpl::GetSocketPoolForHTTPProxy(
std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret =
ssl_socket_pools_for_https_proxies_.insert(std::make_pair(
- http_proxy, new SSLClientSocketPool(
- sockets_per_proxy_server,
- sockets_per_group, cert_verifier_,
- channel_id_service_, transport_security_state_,
- cert_transparency_verifier_, cert_policy_enforcer_,
- ssl_session_cache_shard_, socket_factory_,
- tcp_https_ret.first->second /* https proxy */,
- NULL /* no socks proxy */, NULL /* no http proxy */,
- ssl_config_service_.get(), net_log_)));
+ http_proxy,
+ new SSLClientSocketPool(
+ sockets_per_proxy_server, sockets_per_group, cert_verifier_,
+ channel_id_service_, transport_security_state_,
+ cert_transparency_verifier_, ct_policy_enforcer_,
+ ssl_session_cache_shard_, socket_factory_,
+ tcp_https_ret.first->second /* https proxy */,
+ NULL /* no socks proxy */, NULL /* no http proxy */,
+ ssl_config_service_.get(), net_log_)));
DCHECK(tcp_https_ret.second);
std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
@@ -322,10 +322,10 @@ SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy(
max_sockets_per_group(pool_type_));
SSLClientSocketPool* new_pool = new SSLClientSocketPool(
- sockets_per_proxy_server,
- sockets_per_group, cert_verifier_, channel_id_service_,
- transport_security_state_, cert_transparency_verifier_,
- cert_policy_enforcer_, ssl_session_cache_shard_, socket_factory_,
+ sockets_per_proxy_server, sockets_per_group, cert_verifier_,
+ channel_id_service_, transport_security_state_,
+ cert_transparency_verifier_, ct_policy_enforcer_,
+ ssl_session_cache_shard_, socket_factory_,
NULL, /* no tcp pool, we always go through a proxy */
GetSocketPoolForSOCKSProxy(proxy_server),
GetSocketPoolForHTTPProxy(proxy_server), ssl_config_service_.get(),
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/ssl_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698