Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: net/socket/ssl_server_socket_nss.h

Issue 1376593007: SSL in EmbeddedTestServer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d1bcec690676bdf84324d5728830ec6a203198ad..09a88950df0acb40df7939bf7be7cd35b6b00863 100644
--- a/net/socket/ssl_server_socket_nss.h
+++ b/net/socket/ssl_server_socket_nss.h
@@ -16,7 +16,7 @@
#include "net/base/nss_memio.h"
#include "net/log/net_log.h"
#include "net/socket/ssl_server_socket.h"
-#include "net/ssl/ssl_config_service.h"
+#include "net/ssl/ssl_server_config.h"
namespace net {
@@ -27,7 +27,7 @@ class SSLServerSocketNSS : public SSLServerSocket {
SSLServerSocketNSS(scoped_ptr<StreamSocket> socket,
scoped_refptr<X509Certificate> certificate,
crypto::RSAPrivateKey* key,
- const SSLConfig& ssl_config);
+ const SSLServerConfig& ssl_config);
~SSLServerSocketNSS() override;
// SSLServerSocket interface.
@@ -136,7 +136,7 @@ class SSLServerSocketNSS : public SSLServerSocket {
scoped_ptr<StreamSocket> transport_socket_;
// Options for the SSL socket.
- SSLConfig ssl_config_;
+ SSLServerConfig ssl_config_;
// Certificate for the server.
scoped_refptr<X509Certificate> cert_;

Powered by Google App Engine
This is Rietveld 408576698