Revert 62918 - net: clean up SSLHostInfo construction.

Create an SSLHostInfoFactory interface and plumb it from the HttpCache
to the SSLConnectJob. Also, move the SSLHostInfo reference from the
ssl_config to being passed to the SSLClientSocket.

BUG=none
TEST=net_unittests

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

TBR=agl@chromium.org
Review URL: http://codereview.chromium.org/3846005

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

1 files changed, 2 insertions, 6 deletions

diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 445f3c7..eb54b84 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -48,7 +48,6 @@ enum {
 class ClientSocket;
 class MockClientSocket;
 class SSLClientSocket;
-class SSLHostInfo;
 
 struct MockConnect {
   // Asynchronous connection success.
@@ -534,8 +533,7 @@ class MockClientSocketFactory : public ClientSocketFactory {
   virtual SSLClientSocket* CreateSSLClientSocket(
       ClientSocketHandle* transport_socket,
       const std::string& hostname,
-      const SSLConfig& ssl_config,
-      SSLHostInfo* ssl_host_info);
+      const SSLConfig& ssl_config);
   SocketDataProviderArray<SocketDataProvider>& mock_data() {
     return mock_data_;
   }
@@ -690,7 +688,6 @@ class MockSSLClientSocket : public MockClientSocket {
       net::ClientSocketHandle* transport_socket,
       const std::string& hostname,
       const net::SSLConfig& ssl_config,
-      SSLHostInfo* ssl_host_info,
       net::SSLSocketDataProvider* socket);
   ~MockSSLClientSocket();
 
@@ -871,8 +868,7 @@ class DeterministicMockClientSocketFactory : public ClientSocketFactory {
   virtual SSLClientSocket* CreateSSLClientSocket(
       ClientSocketHandle* transport_socket,
       const std::string& hostname,
-      const SSLConfig& ssl_config,
-      SSLHostInfo* ssl_host_info);
+      const SSLConfig& ssl_config);
 
   SocketDataProviderArray<DeterministicSocketData>& mock_data() {
     return mock_data_;