Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / socket / client_socket_pool_manager_impl.h

diff --git a/src/net/socket/client_socket_pool_manager_impl.h b/src/net/socket/client_socket_pool_manager_impl.h
index 06d4d24..8fc6c49 100644 (file)
--- a/src/net/socket/client_socket_pool_manager_impl.h
+++ b/src/net/socket/client_socket_pool_manager_impl.h
@@ -21,13 +21,13 @@
 namespace net {
 
 class CertVerifier;
+class ChannelIDService;
 class ClientSocketFactory;
 class ClientSocketPoolHistograms;
 class CTVerifier;
 class HttpProxyClientSocketPool;
 class HostResolver;
 class NetLog;
-class ServerBoundCertService;
 class ProxyService;
 class SOCKSClientSocketPool;
 class SSLClientSocketPool;
@@ -61,12 +61,13 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
                               ClientSocketFactory* socket_factory,
                               HostResolver* host_resolver,
                               CertVerifier* cert_verifier,
-                              ServerBoundCertService* server_bound_cert_service,
+                              ChannelIDService* channel_id_service,
                               TransportSecurityState* transport_security_state,
                               CTVerifier* cert_transparency_verifier,
                               const std::string& ssl_session_cache_shard,
                               ProxyService* proxy_service,
                               SSLConfigService* ssl_config_service,
+                              bool enable_ssl_connect_job_waiting,
                               HttpNetworkSession::SocketPoolType pool_type);
   virtual ~ClientSocketPoolManagerImpl();
 
@@ -108,12 +109,13 @@ class ClientSocketPoolManagerImpl : public base::NonThreadSafe,
   ClientSocketFactory* const socket_factory_;
   HostResolver* const host_resolver_;
   CertVerifier* const cert_verifier_;
-  ServerBoundCertService* const server_bound_cert_service_;
+  ChannelIDService* const channel_id_service_;
   TransportSecurityState* const transport_security_state_;
   CTVerifier* const cert_transparency_verifier_;
   const std::string ssl_session_cache_shard_;
   ProxyService* const proxy_service_;
   const scoped_refptr<SSLConfigService> ssl_config_service_;
+  bool enable_ssl_connect_job_waiting_;
   const HttpNetworkSession::SocketPoolType pool_type_;
 
   // Note: this ordering is important.