| Index: net/socket/client_socket_factory.cc
|
| ===================================================================
|
| --- net/socket/client_socket_factory.cc (revision 64966)
|
| +++ net/socket/client_socket_factory.cc (working copy)
|
| @@ -14,7 +14,6 @@
|
| #elif defined(USE_NSS)
|
| #include "net/socket/ssl_client_socket_nss.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"
|
| @@ -38,12 +37,6 @@
|
| return new SSLClientSocketNSS(transport_socket, hostname, ssl_config,
|
| shi.release());
|
| #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());
|
| #else
|
|
|