Attempting to re-land CL 3110006 which turned out to have ...

net/socket/ssl_client_socket_pool.cc

Index: net/socket/ssl_client_socket_pool.cc
===================================================================
--- net/socket/ssl_client_socket_pool.cc	(revision 57349)
+++ net/socket/ssl_client_socket_pool.cc	(working copy)
@@ -42,6 +42,7 @@
       DCHECK(socks_params_.get() == NULL);
       break;
     case ProxyServer::SCHEME_HTTP:
+    case ProxyServer::SCHEME_HTTPS:
       DCHECK(tcp_params_.get() == NULL);
       DCHECK(http_proxy_params_.get() != NULL);
       DCHECK(socks_params_.get() == NULL);
@@ -114,6 +115,7 @@
       next_state_ = STATE_TCP_CONNECT;
       break;
     case ProxyServer::SCHEME_HTTP:
+    case ProxyServer::SCHEME_HTTPS:
       next_state_ = STATE_TUNNEL_CONNECT;
       break;
     case ProxyServer::SCHEME_SOCKS4:
@@ -222,7 +224,7 @@
       params_->http_proxy_params();
   return transport_socket_handle_->Init(
       group_name(), http_proxy_params,
-      http_proxy_params->tcp_params()->destination().priority(), &callback_,
+      http_proxy_params->destination().priority(), &callback_,
       http_proxy_pool_, net_log());
 }