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

net/socket/ssl_client_socket_pool.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
 
 #include <string>
 
 #include "base/ref_counted.h"
@@ skipping 24 matching lines @@
   SSLSocketParams(const scoped_refptr<TCPSocketParams>& tcp_params,
                   const scoped_refptr<HttpProxySocketParams>& http_proxy_params,
                   const scoped_refptr<SOCKSSocketParams>& socks_params,
                   ProxyServer::Scheme proxy,
                   const std::string& hostname,
                   const SSLConfig& ssl_config,
                   int load_flags,
                   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() {
     return socks_params_;
   }
   ProxyServer::Scheme proxy() const { return proxy_; }
   const std::string& hostname() const { return hostname_; }
   const SSLConfig& ssl_config() const { return ssl_config_; }
   int load_flags() const { return load_flags_; }
   bool want_spdy() const { return want_spdy_; }
@@ skipping 47 matching lines @@
     STATE_SSL_CONNECT,
     STATE_SSL_CONNECT_COMPLETE,
     STATE_NONE,
   };
 
   // Starts the SSL connection process.  Returns OK on success and
   // ERR_IO_PENDING if it cannot immediately service the request.
   // Otherwise, it returns a net error code.
   virtual int ConnectInternal();
 
-  void DetermineFirstState();
-
   void OnIOComplete(int result);
 
   // Runs the state transition loop.
   int DoLoop(int result);
 
   int DoTCPConnect();
   int DoTCPConnectComplete(int result);
   int DoSOCKSConnect();
   int DoSOCKSConnectComplete(int result);
   int DoTunnelConnect();
@@ skipping 113 matching lines @@
   PoolBase base_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
 };
 
 REGISTER_SOCKET_PARAMS_FOR_POOL(SSLClientSocketPool, SSLSocketParams);
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_