Remove support for 'system' SSL on Mac (SecureTransport) and Win (SChannel)

net/socket/client_socket_factory.cc

Index: net/socket/client_socket_factory.cc
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index 881a15c65e347f16d1cf5c515be6719ca5e609df..c36f0dfe929e3e145b1bb7af92b848258cdee146 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -10,15 +10,9 @@
 #include "build/build_config.h"
 #include "net/base/cert_database.h"
 #include "net/socket/client_socket_handle.h"
-#if defined(OS_WIN)
-#include "net/socket/ssl_client_socket_nss.h"
-#include "net/socket/ssl_client_socket_win.h"
-#elif defined(USE_OPENSSL)
+#if defined(USE_OPENSSL)
 #include "net/socket/ssl_client_socket_openssl.h"
-#elif defined(USE_NSS) || defined(OS_IOS)
-#include "net/socket/ssl_client_socket_nss.h"
-#elif defined(OS_MACOSX)
-#include "net/socket/ssl_client_socket_mac.h"
+#elif defined(USE_NSS) || defined(OS_MACOSX) || defined(OS_WIN)
 #include "net/socket/ssl_client_socket_nss.h"
 #endif
 #include "net/socket/tcp_client_socket.h"
@@ -112,25 +106,9 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
 #if defined(USE_OPENSSL)
     return new SSLClientSocketOpenSSL(transport_socket, host_and_port,
                                       ssl_config, context);
-#elif defined(USE_NSS) || defined(OS_IOS)
+#elif defined(USE_NSS) || defined(OS_MACOSX) || defined(OS_WIN)
     return new SSLClientSocketNSS(nss_task_runner, transport_socket,
                                   host_and_port, ssl_config, context);
-#elif defined(OS_WIN)
-    if (g_use_system_ssl) {
-      return new SSLClientSocketWin(transport_socket, host_and_port,
-                                    ssl_config, context);
-    }
-    return new SSLClientSocketNSS(nss_task_runner, transport_socket,
-                                  host_and_port, ssl_config,
-                                  context);
-#elif defined(OS_MACOSX)
-    if (g_use_system_ssl) {
-      return new SSLClientSocketMac(transport_socket, host_and_port,
-                                    ssl_config, context);
-    }
-    return new SSLClientSocketNSS(nss_task_runner, transport_socket,
-                                  host_and_port, ssl_config,
-                                  context);
 #else
     NOTIMPLEMENTED();
     return NULL;
@@ -168,17 +146,4 @@ ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
   return g_default_client_socket_factory.Pointer();
 }
 
-// static
-void ClientSocketFactory::UseSystemSSL() {
-  g_use_system_ssl = true;
-
-#if defined(OS_WIN)
-  // Reflect the capability of SSLClientSocketWin.
-  SSLConfigService::SetDefaultVersionMax(SSL_PROTOCOL_VERSION_TLS1);
-#elif defined(OS_MACOSX) && !defined(OS_IOS)
-  // Reflect the capability of SSLClientSocketMac.
-  SSLConfigService::SetDefaultVersionMax(SSL_PROTOCOL_VERSION_TLS1);

[wtc, 2013/01/15 23:26:35]

Please find out if the SSLConfigService::SetDefaultVersionMax()
method can also be removed. I remember I added the method
for the system SSL client sockets.

I am not sure if we also use the method for the
--ssl-version-max command-line option.

-#endif
-}
-
 }  // namespace net