| 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 f613fcf1e244d7d7d2348cbfd678c54085ec4dfd..8c0c5085e6fb9ba094e5a7fb476c0f9afcc91da4 100644
|
| --- a/net/socket/ssl_client_socket_pool.h
|
| +++ b/net/socket/ssl_client_socket_pool.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/ref_counted.h"
|
| #include "base/scoped_ptr.h"
|
| #include "base/time.h"
|
| +#include "net/base/host_port_pair.h"
|
| #include "net/base/host_resolver.h"
|
| #include "net/base/ssl_config_service.h"
|
| #include "net/http/http_response_info.h"
|
| @@ -39,7 +40,7 @@ class SSLSocketParams : public base::RefCounted<SSLSocketParams> {
|
| const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
|
| const scoped_refptr<SOCKSSocketParams>& socks_params,
|
| ProxyServer::Scheme proxy,
|
| - const std::string& hostname,
|
| + const HostPortPair& host_port_pair,
|
| const SSLConfig& ssl_config,
|
| int load_flags,
|
| bool force_spdy_over_ssl,
|
| @@ -53,7 +54,7 @@ class SSLSocketParams : public base::RefCounted<SSLSocketParams> {
|
| return socks_params_;
|
| }
|
| ProxyServer::Scheme proxy() const { return proxy_; }
|
| - const std::string& hostname() const { return hostname_; }
|
| + const HostPortPair& host_port_pair() const { return host_port_pair_; }
|
| const SSLConfig& ssl_config() const { return ssl_config_; }
|
| int load_flags() const { return load_flags_; }
|
| bool force_spdy_over_ssl() const { return force_spdy_over_ssl_; }
|
| @@ -67,7 +68,7 @@ class SSLSocketParams : public base::RefCounted<SSLSocketParams> {
|
| const scoped_refptr<HttpProxySocketParams> http_proxy_params_;
|
| const scoped_refptr<SOCKSSocketParams> socks_params_;
|
| const ProxyServer::Scheme proxy_;
|
| - const std::string hostname_;
|
| + const HostPortPair host_port_pair_;
|
| const SSLConfig ssl_config_;
|
| const int load_flags_;
|
| const bool force_spdy_over_ssl_;
|
|
|