Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 11 insertions, 13 deletions

diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index 3ac5a00..947a2fa 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -16,7 +16,6 @@
 #elif defined(USE_OPENSSL) && defined(ANDROID)
 #include "net/socket/ssl_client_socket_openssl.h"
 #elif defined(OS_MACOSX)
-#include "net/socket/ssl_client_socket_mac.h"
 #include "net/socket/ssl_client_socket_nss.h"
 #endif
 #include "net/socket/ssl_host_info.h"
@@ -24,13 +23,16 @@
 
 namespace net {
 
+class DnsRRResolver;
+
 namespace {
 
 SSLClientSocket* DefaultSSLClientSocketFactory(
     ClientSocketHandle* transport_socket,
     const std::string& hostname,
     const SSLConfig& ssl_config,
-    SSLHostInfo* ssl_host_info) {
+    SSLHostInfo* ssl_host_info,
+    DnsRRResolver* dnsrr_resolver) {
   scoped_ptr<SSLHostInfo> shi(ssl_host_info);
 #if defined(OS_WIN)
   return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
@@ -38,16 +40,10 @@ SSLClientSocket* DefaultSSLClientSocketFactory(
   return new SSLClientSocketOpenSSL(transport_socket, hostname, ssl_config);
 #elif defined(USE_NSS)
   return new SSLClientSocketNSS(transport_socket, hostname, ssl_config,
-                                shi.release());
+                                shi.release(), dnsrr_resolver);
 #elif defined(OS_MACOSX)
-  // TODO(wtc): SSLClientSocketNSS can't do SSL client authentication using
-  // Mac OS X CDSA/CSSM yet (http://crbug.com/45369), so fall back on
-  // SSLClientSocketMac.
-  if (ssl_config.send_client_cert)
-    return new SSLClientSocketMac(transport_socket, hostname, ssl_config);
-
   return new SSLClientSocketNSS(transport_socket, hostname, ssl_config,
-                                shi.release());
+                                shi.release(), dnsrr_resolver);
 #else
   NOTIMPLEMENTED();
   return NULL;
@@ -69,8 +65,10 @@ class DefaultClientSocketFactory : public ClientSocketFactory {
       ClientSocketHandle* transport_socket,
       const std::string& hostname,
       const SSLConfig& ssl_config,
-      SSLHostInfo* ssl_host_info) {
-    return g_ssl_factory(transport_socket, hostname, ssl_config, ssl_host_info);
+      SSLHostInfo* ssl_host_info,
+      DnsRRResolver* dnsrr_resolver) {
+    return g_ssl_factory(transport_socket, hostname, ssl_config, ssl_host_info,
+                         dnsrr_resolver);
   }
 };
 
@@ -96,7 +94,7 @@ SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
   ClientSocketHandle* socket_handle = new ClientSocketHandle();
   socket_handle->set_socket(transport_socket);
   return CreateSSLClientSocket(socket_handle, hostname, ssl_config,
-                               ssl_host_info);
+                               ssl_host_info, NULL /* DnsRRResolver */);
 }
 
 }  // namespace net