| Index: net/socket/ssl_server_socket_nss.cc | 
| diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc | 
| index 3ed4da199510e66d781dff74cc10e36b375fb92c..9bcf8ee85659cba53bac59328f8c42bdf51da12c 100644 | 
| --- a/net/socket/ssl_server_socket_nss.cc | 
| +++ b/net/socket/ssl_server_socket_nss.cc | 
| @@ -83,7 +83,7 @@ | 
| scoped_ptr<StreamSocket> socket, | 
| X509Certificate* cert, | 
| crypto::RSAPrivateKey* key, | 
| -    const SSLServerConfig& ssl_config) { | 
| +    const SSLConfig& ssl_config) { | 
| DCHECK(g_nss_server_sockets_init) << "EnableSSLServerSockets() has not been" | 
| << " called yet!"; | 
|  | 
| @@ -95,7 +95,7 @@ | 
| scoped_ptr<StreamSocket> transport_socket, | 
| scoped_refptr<X509Certificate> cert, | 
| crypto::RSAPrivateKey* key, | 
| -    const SSLServerConfig& ssl_config) | 
| +    const SSLConfig& ssl_config) | 
| : transport_send_busy_(false), | 
| transport_recv_busy_(false), | 
| user_read_buf_len_(0), | 
| @@ -337,15 +337,6 @@ | 
| // TODO(port): set more ssl options!  Check errors! | 
|  | 
| int rv; | 
| - | 
| -  if (ssl_config_.require_client_cert) { | 
| -    rv = SSL_OptionSet(nss_fd_, SSL_REQUEST_CERTIFICATE, PR_TRUE); | 
| -    if (rv != SECSuccess) { | 
| -      LogFailedNSSFunction(net_log_, "SSL_OptionSet", | 
| -                           "SSL_REQUEST_CERTIFICATE"); | 
| -      return ERR_UNEXPECTED; | 
| -    } | 
| -  } | 
|  | 
| rv = SSL_OptionSet(nss_fd_, SSL_SECURITY, PR_TRUE); | 
| if (rv != SECSuccess) { | 
|  |