Use NSS instead of the system SSL library for SSL if

the --use-nss-for-ssl or --use-flip command-line switch
is specified.

R=mark,mbelshe
BUG=28744
TEST=Run chrome.exe with and without --use-nss-for-ssl.
SSL should work in both cases.
Review URL: http://codereview.chromium.org/555186

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

1 files changed, 30 insertions, 10 deletions

diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index 9458381..6a3a4cc 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -17,6 +17,27 @@
 
 namespace net {
 
+namespace {
+
+SSLClientSocket* DefaultSSLClientSocketFactory(
+    ClientSocket* transport_socket,
+    const std::string& hostname,
+    const SSLConfig& ssl_config) {
+#if defined(OS_WIN)
+  return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
+#elif defined(USE_NSS)
+  return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
+#elif defined(OS_MACOSX)
+  return new SSLClientSocketMac(transport_socket, hostname, ssl_config);
+#else
+  NOTIMPLEMENTED();
+  return NULL;
+#endif
+}
+
+// True if we should use NSS instead of the system SSL library for SSL.
+SSLClientSocketFactory g_ssl_factory = DefaultSSLClientSocketFactory;
+
 class DefaultClientSocketFactory : public ClientSocketFactory {
  public:
   virtual ClientSocket* CreateTCPClientSocket(
@@ -28,22 +49,21 @@ class DefaultClientSocketFactory : public ClientSocketFactory {
       ClientSocket* transport_socket,
       const std::string& hostname,
       const SSLConfig& ssl_config) {
-#if defined(OS_WIN)
-    return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
-#elif defined(USE_NSS)
-    return new SSLClientSocketNSS(transport_socket, hostname, ssl_config);
-#elif defined(OS_MACOSX)
-    return new SSLClientSocketMac(transport_socket, hostname, ssl_config);
-#else
-    NOTIMPLEMENTED();
-    return NULL;
-#endif
+    return g_ssl_factory(transport_socket, hostname, ssl_config);
   }
 };
 
+}  // namespace
+
 // static
 ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
   return Singleton<DefaultClientSocketFactory>::get();
 }
 
+// static
+void ClientSocketFactory::SetSSLClientSocketFactory(
+    SSLClientSocketFactory factory) {
+  g_ssl_factory = factory;
+}
+
 }  // namespace net