Remove ref-counting from StreamListenSocket

net/socket/stream_listen_socket.h

 // 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.
 
 // Stream-based listen socket implementation that handles reading and writing
 // to the socket, but does not handle creating the socket nor connecting
 // sockets, which are handled by subclasses on creation and in Accept,
 // respectively.
 
 // StreamListenSocket handles IO asynchronously in the specified MessageLoop.
@@ skipping 12 matching lines @@
 #endif
 #include <string>
 #if defined(OS_WIN)
 #include "base/win/object_watcher.h"
 #elif defined(OS_POSIX)
 #include "base/message_loop/message_loop.h"
 #endif
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
 #include "net/socket/socket_descriptor.h"
 
 namespace net {
 
 class IPEndPoint;
 
 class NET_EXPORT StreamListenSocket
-    : public base::RefCountedThreadSafe<StreamListenSocket>,
+    :
 #if defined(OS_WIN)
       public base::win::ObjectWatcher::Delegate {
 #elif defined(OS_POSIX)
       public base::MessageLoopForIO::Watcher {
 #endif
 
  public:
+  virtual ~StreamListenSocket();
+
   // TODO(erikkay): this delegate should really be split into two parts
   // to split up the listener from the connected socket.  Perhaps this class
   // should be split up similarly.
   class Delegate {
    public:
     // |server| is the original listening Socket, connection is the new
-    // Socket that was created.  Ownership of |connection| is transferred
-    // to the delegate with this call.
+    // Socket that was created.
     virtual void DidAccept(StreamListenSocket* server,
-                           StreamListenSocket* connection) = 0;
+                           scoped_ptr<StreamListenSocket> connection) = 0;
     virtual void DidRead(StreamListenSocket* connection,
                          const char* data,
                          int len) = 0;
     virtual void DidClose(StreamListenSocket* sock) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   // Send data to the socket.
   void Send(const char* bytes, int len, bool append_linefeed = false);
   void Send(const std::string& str, bool append_linefeed = false);
 
   // Copies the local address to |address|. Returns a network error code.
   int GetLocalAddress(IPEndPoint* address);
 
   static const int kSocketError;
 
  protected:
   enum WaitState {
     NOT_WAITING      = 0,
     WAITING_ACCEPT   = 1,
     WAITING_READ     = 2
   };
 
   StreamListenSocket(SocketDescriptor s, Delegate* del);
-  virtual ~StreamListenSocket();
 
   SocketDescriptor AcceptSocket();
   virtual void Accept() = 0;
 
   void Listen();
   void Read();
   void Close();
   void CloseSocket(SocketDescriptor s);
 
   // Pass any value in case of Windows, because in Windows
   // we are not using state.
   void WatchSocket(WaitState state);
   void UnwatchSocket();
 
   Delegate* const socket_delegate_;
 
  private:
-  friend class base::RefCountedThreadSafe<StreamListenSocket>;
   friend class TransportClientSocketTest;
 
   void SendInternal(const char* bytes, int len);
 
 #if defined(OS_WIN)
   // ObjectWatcher delegate.
   virtual void OnObjectSignaled(HANDLE object);
   base::win::ObjectWatcher watcher_;
   HANDLE socket_event_;
 #elif defined(OS_POSIX)
@@ skipping 18 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(StreamListenSocket);
 };
 
 // Abstract factory that must be subclassed for each subclass of
 // StreamListenSocket.
 class NET_EXPORT StreamListenSocketFactory {
  public:
   virtual ~StreamListenSocketFactory() {}
 
   // Returns a new instance of StreamListenSocket or NULL if an error occurred.
-  virtual scoped_refptr<StreamListenSocket> CreateAndListen(
+  virtual scoped_ptr<StreamListenSocket> CreateAndListen(
       StreamListenSocket::Delegate* delegate) const = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_LISTEN_SOCKET_H_