[net] Use scoped_ptr<> consistently in ClientSocketFactory and related code

This will make it easier to modify ClientSocketFactory et al. to support
reprioritization. This also fixes a few latent memory leaks in tests.

Make SocketStream use a ClientSocketHandle instead of
just a StreamSocket.

Rename {set,release}_socket() to {Set,Pass}Socket().

BUG=166689
TBR=eroman@chromium.org, rsleevi@chromium.org, sergeyu@chromium.org

Review URL: https://codereview.chromium.org/22995002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217707 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/net/socket/ssl_server_socket_openssl.cc b/net/socket/ssl_server_socket_openssl.cc
index e0cf8bc..c327f2c 100644
--- a/net/socket/ssl_server_socket_openssl.cc
+++ b/net/socket/ssl_server_socket_openssl.cc
@@ -16,13 +16,13 @@ void EnableSSLServerSockets() {
   NOTIMPLEMENTED();
 }
 
-SSLServerSocket* CreateSSLServerSocket(StreamSocket* socket,
-                                       X509Certificate* certificate,
-                                       crypto::RSAPrivateKey* key,
-                                       const SSLConfig& ssl_config) {
+scoped_ptr<SSLServerSocket> CreateSSLServerSocket(
+    scoped_ptr<StreamSocket> socket,
+    X509Certificate* certificate,
+    crypto::RSAPrivateKey* key,
+    const SSLConfig& ssl_config) {
   NOTIMPLEMENTED();
-  delete socket;
-  return NULL;
+  return scoped_ptr<SSLServerSocket>();
 }
 
 }  // namespace net