Index: net/socket/ssl_server_socket.h |
diff --git a/net/socket/ssl_server_socket.h b/net/socket/ssl_server_socket.h |
index 61877d2f5f9bff775d3f405387a5bd1948e4fa53..52647257c084aa9869d83ef054d0b1f43b853b86 100644 |
--- a/net/socket/ssl_server_socket.h |
+++ b/net/socket/ssl_server_socket.h |
@@ -8,7 +8,7 @@ |
#include "base/basictypes.h" |
#include "net/base/completion_callback.h" |
#include "net/base/net_api.h" |
-#include "net/socket/socket.h" |
+#include "net/socket/stream_socket.h" |
namespace crypto { |
class RSAPrivateKey; |
@@ -20,33 +20,20 @@ class IOBuffer; |
struct SSLConfig; |
class X509Certificate; |
-// SSLServerSocket takes an already connected socket and performs SSL on top of |
-// it. |
-// |
-// This class is designed to work in a peer-to-peer connection and is not |
-// intended to be used as a standalone SSL server. |
-class SSLServerSocket : public Socket { |
- public: |
- virtual ~SSLServerSocket() {} |
- |
- // Performs an SSL server handshake on the existing socket. The given socket |
- // must have already been connected. |
- // |
- // Accept either returns ERR_IO_PENDING, in which case the given callback |
- // will be called in the future with the real result, or it completes |
- // synchronously, returning the result immediately. |
- virtual int Accept(CompletionCallback* callback) = 0; |
-}; |
- |
// Creates an SSL server socket using an already connected socket. A certificate |
// and private key needs to be provided. |
// |
-// This created server socket will take ownership of |socket|. However |key| |
-// is copied. |
-// TODO(hclam): Defines ServerSocketFactory to create SSLServerSocket. This will |
-// make mocking easier. |
-NET_API SSLServerSocket* CreateSSLServerSocket( |
- Socket* socket, X509Certificate* certificate, crypto::RSAPrivateKey* key, |
+// The SSL StreamSocket takes ownership of |socket|. |
+// It takes a reference to |certificate|. |
+// The |key| and |ssl_config| parameters are copied. |key| cannot be const |
+// because the methods used to copy its contents are non-const. |
+// |
+// The caller starts the SSL connection acceptance protocol by calling Connect |
+// on the returned socket. |
+NET_API StreamSocket* CreateSSLServerSocket( |
+ StreamSocket* socket, |
+ X509Certificate* certificate, |
+ crypto::RSAPrivateKey* key, |
const SSLConfig& ssl_config); |
} // namespace net |