| Index: net/socket/ssl_server_socket_nss.h
|
| diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h
|
| index 73a659e5bdfece1fff3c3580b681c1a74e6415a2..b583ad94d2be4cf831bc56b4507ceb72f69f4c26 100644
|
| --- a/net/socket/ssl_server_socket_nss.h
|
| +++ b/net/socket/ssl_server_socket_nss.h
|
| @@ -28,7 +28,7 @@ class SSLServerSocketNSS : public SSLServerSocket {
|
| SSLServerSocketNSS(scoped_ptr<StreamSocket> socket,
|
| scoped_refptr<X509Certificate> certificate,
|
| crypto::RSAPrivateKey* key,
|
| - const SSLServerConfig& ssl_config);
|
| + const SSLServerConfig& ssl_server_config);
|
| ~SSLServerSocketNSS() override;
|
|
|
| // SSLServerSocket interface.
|
| @@ -138,7 +138,7 @@ class SSLServerSocketNSS : public SSLServerSocket {
|
| scoped_ptr<StreamSocket> transport_socket_;
|
|
|
| // Options for the SSL socket.
|
| - SSLServerConfig ssl_config_;
|
| + SSLServerConfig ssl_server_config_;
|
|
|
| // Certificate for the server.
|
| scoped_refptr<X509Certificate> cert_;
|
|
|