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

Unified Diff: net/socket/ssl_client_socket_nss_factory.cc

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_nss_factory.h ('k') | net/socket/ssl_client_socket_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss_factory.cc
===================================================================
--- net/socket/ssl_client_socket_nss_factory.cc (revision 62921)
+++ net/socket/ssl_client_socket_nss_factory.cc (working copy)
@@ -20,9 +20,7 @@
SSLClientSocket* SSLClientSocketNSSFactory(
ClientSocketHandle* transport_socket,
const std::string& hostname,
- const SSLConfig& ssl_config,
- SSLHostInfo* ssl_host_info) {
- scoped_ptr<SSLHostInfo> shi(ssl_host_info);
+ const SSLConfig& ssl_config) {
// TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using
// CryptoAPI yet (http://crbug.com/37560), so we fall back on
// SSLClientSocketWin.
@@ -31,8 +29,7 @@
return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
#endif
- return new SSLClientSocketNSS(transport_socket, hostname, ssl_config,
- shi.release());
+ return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
}
} // namespace net
« no previous file with comments | « net/socket/ssl_client_socket_nss_factory.h ('k') | net/socket/ssl_client_socket_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698