Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Unified Diff: net/socket/ssl_client_socket_nss.h

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_mac_factory.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.h
===================================================================
--- net/socket/ssl_client_socket_nss.h (revision 62921)
+++ net/socket/ssl_client_socket_nss.h (working copy)
@@ -30,7 +30,6 @@
class BoundNetLog;
class CertVerifier;
class ClientSocketHandle;
-class SSLHostInfo;
class X509Certificate;
// An SSL client socket implemented with Mozilla NSS.
@@ -42,8 +41,7 @@
// settings.
SSLClientSocketNSS(ClientSocketHandle* transport_socket,
const std::string& hostname,
- const SSLConfig& ssl_config,
- SSLHostInfo* ssl_host_info);
+ const SSLConfig& ssl_config);
~SSLClientSocketNSS();
// SSLClientSocket methods:
@@ -215,14 +213,12 @@
// 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_host_info_|
+ // the last NPN protocol used is serialised in |ssl_config.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
« no previous file with comments | « net/socket/ssl_client_socket_mac_factory.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698