Added SSLHostInfo. Storing of server host info to our standard disk cache.

net/socket/socket_test_util.cc

Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 895579b780c3de00391e7549b51aa32ec10b7620..850cfe420fe994798384dbfd0ee59b651fde9032 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -23,6 +23,7 @@
 #include "net/http/http_response_headers.h"
 #include "net/socket/client_socket_pool_histograms.h"
 #include "net/socket/socket.h"
+#include "net/socket/ssl_host_info.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -687,11 +688,12 @@ scoped_ptr<SSLClientSocket> MockClientSocketFactory::CreateSSLClientSocket(
     scoped_ptr<ClientSocketHandle> transport_socket,
     const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
+    SSLHostInfo* ssl_host_info,
     const SSLClientSocketContext& context) {
   return scoped_ptr<SSLClientSocket>(
       new MockSSLClientSocket(transport_socket.Pass(),
                               host_and_port, ssl_config,
-                              mock_ssl_data_.GetNext()));
+                              ssl_host_info, mock_ssl_data_.GetNext()));
 }
 
 void MockClientSocketFactory::ClearSSLSessionCache() {
@@ -1295,6 +1297,7 @@ MockSSLClientSocket::MockSSLClientSocket(
     scoped_ptr<ClientSocketHandle> transport_socket,
     const HostPortPair& host_port_pair,
     const SSLConfig& ssl_config,
+    SSLHostInfo* ssl_host_info,
     SSLSocketDataProvider* data)
     : MockClientSocket(
          // Have to use the right BoundNetLog for LoadTimingInfo regression
@@ -1308,6 +1311,7 @@ MockSSLClientSocket::MockSSLClientSocket(
       protocol_negotiated_(kProtoUnknown) {
   DCHECK(data_);
   peer_addr_ = data->connect.peer_addr;
+  delete ssl_host_info;  // we take ownership but don't use it.
 }
 
 MockSSLClientSocket::~MockSSLClientSocket() {
@@ -1836,11 +1840,12 @@ DeterministicMockClientSocketFactory::CreateSSLClientSocket(
     scoped_ptr<ClientSocketHandle> transport_socket,
     const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
+    SSLHostInfo* ssl_host_info,
     const SSLClientSocketContext& context) {
   scoped_ptr<MockSSLClientSocket> socket(
       new MockSSLClientSocket(transport_socket.Pass(),
                               host_and_port, ssl_config,
-                              mock_ssl_data_.GetNext()));
+                              ssl_host_info, mock_ssl_data_.GetNext()));
   ssl_client_sockets_.push_back(socket.get());
   return socket.PassAs<SSLClientSocket>();
 }