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

Unified Diff: net/socket/ssl_client_socket_pool.h

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: net/socket/ssl_client_socket_pool.h
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index e03b76ade6ab5946e2d981e7d7802b1cb70d6dba..f46bb785ced8a2885d6059540320a5a7bfd5fb16 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -42,31 +42,28 @@ class NET_EXPORT_PRIVATE SSLSocketParams
// Exactly one of |direct_params|, |socks_proxy_params|, and
// |http_proxy_params| must be non-NULL.
- SSLSocketParams(
- const scoped_refptr<TransportSocketParams>& direct_params,
- const scoped_refptr<SOCKSSocketParams>& socks_proxy_params,
- const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
- const HostPortPair& host_and_port,
- const SSLConfig& ssl_config,
- PrivacyMode privacy_mode,
- int load_flags,
- bool force_spdy_over_ssl,
- bool want_spdy_over_npn);
+ SSLSocketParams(const scoped_refptr<TransportSocketParams>& direct_params,
+ const scoped_refptr<SOCKSSocketParams>& socks_proxy_params,
+ const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
+ const HostPortPair& host_and_port,
+ const SSLConfig& ssl_config,
+ PrivacyMode privacy_mode,
+ int load_flags,
+ bool force_spdy_over_ssl,
+ bool want_spdy_over_npn);
// Returns the type of the underlying connection.
ConnectionType GetConnectionType() const;
// Must be called only when GetConnectionType() returns DIRECT.
- const scoped_refptr<TransportSocketParams>&
- GetDirectConnectionParams() const;
+ const scoped_refptr<TransportSocketParams>& GetDirectConnectionParams() const;
// Must be called only when GetConnectionType() returns SOCKS_PROXY.
- const scoped_refptr<SOCKSSocketParams>&
- GetSocksProxyConnectionParams() const;
+ const scoped_refptr<SOCKSSocketParams>& GetSocksProxyConnectionParams() const;
// Must be called only when GetConnectionType() returns HTTP_PROXY.
- const scoped_refptr<HttpProxySocketParams>&
- GetHttpProxyConnectionParams() const;
+ const scoped_refptr<HttpProxySocketParams>& GetHttpProxyConnectionParams()
+ const;
const HostPortPair& host_and_port() const { return host_and_port_; }
const SSLConfig& ssl_config() const { return ssl_config_; }
@@ -98,25 +95,24 @@ class NET_EXPORT_PRIVATE SSLSocketParams
// connection as specified in the params.
class SSLConnectJob : public ConnectJob {
public:
- SSLConnectJob(
- const std::string& group_name,
- RequestPriority priority,
- const scoped_refptr<SSLSocketParams>& params,
- const base::TimeDelta& timeout_duration,
- TransportClientSocketPool* transport_pool,
- SOCKSClientSocketPool* socks_pool,
- HttpProxyClientSocketPool* http_proxy_pool,
- ClientSocketFactory* client_socket_factory,
- HostResolver* host_resolver,
- const SSLClientSocketContext& context,
- Delegate* delegate,
- NetLog* net_log);
+ SSLConnectJob(const std::string& group_name,
+ RequestPriority priority,
+ const scoped_refptr<SSLSocketParams>& params,
+ const base::TimeDelta& timeout_duration,
+ TransportClientSocketPool* transport_pool,
+ SOCKSClientSocketPool* socks_pool,
+ HttpProxyClientSocketPool* http_proxy_pool,
+ ClientSocketFactory* client_socket_factory,
+ HostResolver* host_resolver,
+ const SSLClientSocketContext& context,
+ Delegate* delegate,
+ NetLog* net_log);
virtual ~SSLConnectJob();
// ConnectJob methods.
virtual LoadState GetLoadState() const OVERRIDE;
- virtual void GetAdditionalErrorState(ClientSocketHandle * handle) OVERRIDE;
+ virtual void GetAdditionalErrorState(ClientSocketHandle* handle) OVERRIDE;
private:
enum State {
@@ -182,22 +178,21 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
// Only the pools that will be used are required. i.e. if you never
// try to create an SSL over SOCKS socket, |socks_pool| may be NULL.
- SSLClientSocketPool(
- int max_sockets,
- int max_sockets_per_group,
- ClientSocketPoolHistograms* histograms,
- HostResolver* host_resolver,
- CertVerifier* cert_verifier,
- ServerBoundCertService* server_bound_cert_service,
- TransportSecurityState* transport_security_state,
- CTVerifier* cert_transparency_verifier,
- const std::string& ssl_session_cache_shard,
- ClientSocketFactory* client_socket_factory,
- TransportClientSocketPool* transport_pool,
- SOCKSClientSocketPool* socks_pool,
- HttpProxyClientSocketPool* http_proxy_pool,
- SSLConfigService* ssl_config_service,
- NetLog* net_log);
+ SSLClientSocketPool(int max_sockets,
+ int max_sockets_per_group,
+ ClientSocketPoolHistograms* histograms,
+ HostResolver* host_resolver,
+ CertVerifier* cert_verifier,
+ ServerBoundCertService* server_bound_cert_service,
+ TransportSecurityState* transport_security_state,
+ CTVerifier* cert_transparency_verifier,
+ const std::string& ssl_session_cache_shard,
+ ClientSocketFactory* client_socket_factory,
+ TransportClientSocketPool* transport_pool,
+ SOCKSClientSocketPool* socks_pool,
+ HttpProxyClientSocketPool* http_proxy_pool,
+ SSLConfigService* ssl_config_service,
+ NetLog* net_log);
virtual ~SSLClientSocketPool();
@@ -264,14 +259,13 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
class SSLConnectJobFactory : public PoolBase::ConnectJobFactory {
public:
- SSLConnectJobFactory(
- TransportClientSocketPool* transport_pool,
- SOCKSClientSocketPool* socks_pool,
- HttpProxyClientSocketPool* http_proxy_pool,
- ClientSocketFactory* client_socket_factory,
- HostResolver* host_resolver,
- const SSLClientSocketContext& context,
- NetLog* net_log);
+ SSLConnectJobFactory(TransportClientSocketPool* transport_pool,
+ SOCKSClientSocketPool* socks_pool,
+ HttpProxyClientSocketPool* http_proxy_pool,
+ ClientSocketFactory* client_socket_factory,
+ HostResolver* host_resolver,
+ const SSLClientSocketContext& context,
+ NetLog* net_log);
virtual ~SSLConnectJobFactory() {}

Powered by Google App Engine
This is Rietveld 408576698