Remove ref-counting from StreamListenSocket

net/socket/tcp_listen_socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/tcp_listen_socket.h"
 
 #if defined(OS_WIN)
 // winsock2.h must be included first in order to ensure it is included before
 // windows.h.
 #include <winsock2.h>
@@ skipping 11 matching lines @@
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "net/base/net_util.h"
 #include "net/base/winsock_init.h"
 
 using std::string;
 
 namespace net {
 
 // static
-scoped_refptr<TCPListenSocket> TCPListenSocket::CreateAndListen(
+scoped_ptr<TCPListenSocket> TCPListenSocket::CreateAndListen(
     const string& ip, int port, StreamListenSocket::Delegate* del) {
   SocketDescriptor s = CreateAndBind(ip, port);
   if (s == kInvalidSocket)
-    return NULL;
-  scoped_refptr<TCPListenSocket> sock(new TCPListenSocket(s, del));
+    return scoped_ptr<TCPListenSocket>();
+  scoped_ptr<TCPListenSocket> sock(new TCPListenSocket(s, del));
   sock->Listen();
-  return sock;
+  return sock.Pass();
 }
 
 TCPListenSocket::TCPListenSocket(SocketDescriptor s,
                                  StreamListenSocket::Delegate* del)
     : StreamListenSocket(s, del) {
 }
 
 TCPListenSocket::~TCPListenSocket() {}
 
 SocketDescriptor TCPListenSocket::CreateAndBind(const string& ip, int port) {
@@ skipping 47 matching lines @@
     return kInvalidSocket;
   }
   *port = base::NetToHost16(addr.sin_port);
   return s;
 }
 
 void TCPListenSocket::Accept() {
   SocketDescriptor conn = AcceptSocket();
   if (conn == kInvalidSocket)
     return;
-  scoped_refptr<TCPListenSocket> sock(
+  scoped_ptr<TCPListenSocket> sock(
       new TCPListenSocket(conn, socket_delegate_));
   // It's up to the delegate to AddRef if it wants to keep it around.
 #if defined(OS_POSIX)
   sock->WatchSocket(WAITING_READ);
 #endif
-  socket_delegate_->DidAccept(this, sock.get());
+  socket_delegate_->DidAccept(this, sock.PassAs<StreamListenSocket>());
 }
 
 TCPListenSocketFactory::TCPListenSocketFactory(const string& ip, int port)
     : ip_(ip),
       port_(port) {
 }
 
 TCPListenSocketFactory::~TCPListenSocketFactory() {}
 
-scoped_refptr<StreamListenSocket> TCPListenSocketFactory::CreateAndListen(
+scoped_ptr<StreamListenSocket> TCPListenSocketFactory::CreateAndListen(
     StreamListenSocket::Delegate* delegate) const {
-  return TCPListenSocket::CreateAndListen(ip_, port_, delegate);
+  return TCPListenSocket::CreateAndListen(ip_, port_, delegate)
+      .PassAs<StreamListenSocket>();
 }
 
 }  // namespace net