Revert revert 62918 - net: clean up SSLHostInfo construction."

Was reverted in r62922 due to a change landing between the try run and the
commit.

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

1 files changed, 6 insertions, 2 deletions

diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index db567c4..8518084 100644
--- a/net/socket/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -30,6 +30,7 @@ namespace net {
 class BoundNetLog;
 class CertVerifier;
 class ClientSocketHandle;
+class SSLHostInfo;
 class X509Certificate;
 
 // An SSL client socket implemented with Mozilla NSS.
@@ -41,7 +42,8 @@ class SSLClientSocketNSS : public SSLClientSocket {
   // settings.
   SSLClientSocketNSS(ClientSocketHandle* transport_socket,
                      const std::string& hostname,
-                     const SSLConfig& ssl_config);
+                     const SSLConfig& ssl_config,
+                     SSLHostInfo* ssl_host_info);
   ~SSLClientSocketNSS();
 
   // SSLClientSocket methods:
@@ -213,12 +215,14 @@ class SSLClientSocketNSS : public SSLClientSocket {
 
   // When performing Snap Start we need to predict the NPN protocol which the
   // server is going to speak before we actually perform the handshake. Thus
-  // the last NPN protocol used is serialised in |ssl_config.ssl_host_info|
+  // the last NPN protocol used is serialised in |ssl_host_info_|
   // and kept in these fields:
   SSLClientSocket::NextProtoStatus predicted_npn_status_;
   std::string predicted_npn_proto_;
   bool predicted_npn_proto_used_;
 
+  scoped_ptr<SSLHostInfo> ssl_host_info_;
+
 #if defined(OS_WIN)
   // A CryptoAPI in-memory certificate store.  We use it for two purposes:
   // 1. Import server certificates into this store so that we can verify and