Correctly handle SSL Client Authentication requests when connecting

to an HTTPS/SPDY proxy.  Modify SSLClientSocket classes to correctly set the host_and_port field of the cert_request_info.  Modify HttpNetworkTransaction to use this field when populating the SSL client auth cache.

BUG=59292
TEST=HttpProxyClientSocketPoolTest.SslClientAuth

Review URL: http://codereview.chromium.org/4339001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65976 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index 1711722..11cf250 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -25,6 +25,7 @@ namespace net {
 class ClientSocketFactory;
 class ConnectJobFactory;
 class DnsRRResolver;
+class HostPortPair;
 class HttpProxyClientSocketPool;
 class HttpProxySocketParams;
 class SOCKSClientSocketPool;
@@ -43,7 +44,7 @@ class SSLSocketParams : public base::RefCounted<SSLSocketParams> {
                   const scoped_refptr<SOCKSSocketParams>& socks_params,
                   const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
                   ProxyServer::Scheme proxy,
-                  const std::string& hostname,
+                  const HostPortPair& host_and_port,
                   const SSLConfig& ssl_config,
                   int load_flags,
                   bool force_spdy_over_ssl,
@@ -57,7 +58,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_and_port() const { return host_and_port_; }
   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_; }
@@ -71,7 +72,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_and_port_;
   const SSLConfig ssl_config_;
   const int load_flags_;
   const bool force_spdy_over_ssl_;