Merge 54714 - Recommit 54405 - Fix late binding induced mismatch of Socket an...

net/socket/ssl_client_socket_pool.h

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 fd5bbb3f6b19a2e706b1231fe0cd2b3ca89689e7..6d7bdd75fb90838a17636fd0c4b91417b8e825db 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -42,7 +42,7 @@ class SSLSocketParams : public base::RefCounted<SSLSocketParams> {
                   bool want_spdy);
 
   const scoped_refptr<TCPSocketParams>& tcp_params() { return tcp_params_; }
-  const scoped_refptr<HttpProxySocketParams>& http_proxy_params () {
+  const scoped_refptr<HttpProxySocketParams>& http_proxy_params() {
     return http_proxy_params_;
   }
   const scoped_refptr<SOCKSSocketParams>& socks_params() {
@@ -110,8 +110,6 @@ class SSLConnectJob : public ConnectJob {
   // Otherwise, it returns a net error code.
   virtual int ConnectInternal();
 
-  void DetermineFirstState();
-
   void OnIOComplete(int result);
 
   // Runs the state transition loop.