net/socket/client_socket_factory.cc - Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/client_socket_factory.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs

Patch Set: rebase Created 5 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:

Index: net/socket/client_socket_factory.cc

diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc

index 51aea715f4d157e9388b923906034eca8e9ed92f..cb5d85104869ab0da191117667a19609c16150e1 100644

--- a/net/socket/client_socket_factory.cc

+++ b/net/socket/client_socket_factory.cc

@@ -12,7 +12,7 @@

#include "net/socket/client_socket_handle.h"

#if defined(USE_OPENSSL)

#include "net/socket/ssl_client_socket_openssl.h"

-#elif defined(USE_NSS) || defined(OS_MACOSX) || defined(OS_WIN)

+#elif defined(USE_NSS_CERTS) || defined(OS_MACOSX) || defined(OS_WIN)

#include "net/socket/ssl_client_socket_nss.h"

#endif

#include "net/socket/tcp_client_socket.h"

@@ -107,7 +107,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory,

return scoped_ptr<SSLClientSocket>(

new SSLClientSocketOpenSSL(transport_socket.Pass(), host_and_port,

ssl_config, context));

-#elif defined(USE_NSS) || defined(OS_MACOSX) || defined(OS_WIN)

+#elif defined(USE_NSS_CERTS) || defined(OS_MACOSX) || defined(OS_WIN)

return scoped_ptr<SSLClientSocket>(

new SSLClientSocketNSS(nss_task_runner.get(),

transport_socket.Pass(),