| Index: net/socket/ssl_client_socket.h
|
| diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
|
| index 46461df2ead1fcc6f1424a7eebe533a5ffdc4768..0fbb3f43d8f51ea71e776f3b27e4a4dc8f4dd9f6 100644
|
| --- a/net/socket/ssl_client_socket.h
|
| +++ b/net/socket/ssl_client_socket.h
|
| @@ -25,6 +25,7 @@ class ServerBoundCertService;
|
| class SSLCertRequestInfo;
|
| struct SSLConfig;
|
| class SSLInfo;
|
| +class SSLSocketConfigService;
|
| class TransportSecurityState;
|
| class X509Certificate;
|
|
|
| @@ -36,20 +37,23 @@ struct SSLClientSocketContext {
|
| channel_id_service(NULL),
|
| transport_security_state(NULL),
|
| cert_transparency_verifier(NULL),
|
| - cert_policy_enforcer(NULL) {}
|
| + cert_policy_enforcer(NULL),
|
| + ssl_socket_config_service(NULL) {}
|
|
|
| SSLClientSocketContext(CertVerifier* cert_verifier_arg,
|
| ChannelIDService* channel_id_service_arg,
|
| TransportSecurityState* transport_security_state_arg,
|
| CTVerifier* cert_transparency_verifier_arg,
|
| CertPolicyEnforcer* cert_policy_enforcer_arg,
|
| - const std::string& ssl_session_cache_shard_arg)
|
| + const std::string& ssl_session_cache_shard_arg,
|
| + SSLSocketConfigService* ssl_socket_config_service_arg)
|
| : cert_verifier(cert_verifier_arg),
|
| channel_id_service(channel_id_service_arg),
|
| transport_security_state(transport_security_state_arg),
|
| cert_transparency_verifier(cert_transparency_verifier_arg),
|
| cert_policy_enforcer(cert_policy_enforcer_arg),
|
| - ssl_session_cache_shard(ssl_session_cache_shard_arg) {}
|
| + ssl_session_cache_shard(ssl_session_cache_shard_arg),
|
| + ssl_socket_config_service(ssl_socket_config_service_arg) {}
|
|
|
| CertVerifier* cert_verifier;
|
| ChannelIDService* channel_id_service;
|
| @@ -60,6 +64,7 @@ struct SSLClientSocketContext {
|
| // SSL session cache. SSL sockets with the same ssl_session_cache_shard may
|
| // resume each other's SSL sessions but we'll never sessions between shards.
|
| const std::string ssl_session_cache_shard;
|
| + SSLSocketConfigService* ssl_socket_config_service;
|
| };
|
|
|
| // A client socket that uses SSL as the transport layer.
|
|
|