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

Unified Diff: net/socket/client_socket_factory.cc

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing use_openssl (requires WebRTC change to compile) Created 4 years, 8 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
Index: net/socket/client_socket_factory.cc
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index 311f926b59fcefdc3f2c9be276d025c0251dfcd3..1a63cd702f2623fbe64c4b464e5a61a02c381bc6 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -13,11 +13,7 @@
#include "net/socket/tcp_client_socket.h"
#include "net/udp/udp_client_socket.h"
-#if defined(USE_OPENSSL)
#include "net/socket/ssl_client_socket_openssl.h"
-#else
-#include "net/socket/ssl_client_socket_nss.h"
-#endif
namespace net {
@@ -71,13 +67,8 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
const SSLClientSocketContext& context) override {
-#if defined(USE_OPENSSL)
return scoped_ptr<SSLClientSocket>(new SSLClientSocketOpenSSL(
std::move(transport_socket), host_and_port, ssl_config, context));
-#else
- return scoped_ptr<SSLClientSocket>(new SSLClientSocketNSS(
- std::move(transport_socket), host_and_port, ssl_config, context));
-#endif
}
void ClearSSLSessionCache() override { SSLClientSocket::ClearSessionCache(); }

Powered by Google App Engine
This is Rietveld 408576698