Remove ref-counting from StreamListenSocket

net/test/embedded_test_server/embedded_test_server.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.
 
 #ifndef NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
 #define NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 15 matching lines @@
 
 class HttpConnection;
 class HttpResponse;
 struct HttpRequest;
 
 // This class is required to be able to have composition instead of inheritance,
 class HttpListenSocket : public TCPListenSocket {
  public:
   HttpListenSocket(const SocketDescriptor socket_descriptor,
                    StreamListenSocket::Delegate* delegate);
+  virtual ~HttpListenSocket();
   virtual void Listen();
 
  private:
-  virtual ~HttpListenSocket();
 
   base::ThreadChecker thread_checker_;
 };
 
 // Class providing an HTTP server for testing purpose. This is a basic server
 // providing only an essential subset of HTTP/1.1 protocol. Especially,
 // it assumes that the request syntax is correct. It *does not* support
 // a Chunked Transfer Encoding.
 //
 // The common use case is below:
@@ skipping 80 matching lines @@
   // Shuts down the server.
   void ShutdownOnIOThread();
 
   // Handles a request when it is parsed. It passes the request to registed
   // request handlers and sends a http response.
   void HandleRequest(HttpConnection* connection,
                      scoped_ptr<HttpRequest> request);
 
   // StreamListenSocket::Delegate overrides:
   virtual void DidAccept(StreamListenSocket* server,
-                         StreamListenSocket* connection) OVERRIDE;
+                         scoped_ptr<StreamListenSocket> connection) OVERRIDE;
   virtual void DidRead(StreamListenSocket* connection,
                        const char* data,
                        int length) OVERRIDE;
   virtual void DidClose(StreamListenSocket* connection) OVERRIDE;
 
   HttpConnection* FindConnection(StreamListenSocket* socket);
 
   scoped_refptr<base::SingleThreadTaskRunner> io_thread_;
 
-  scoped_refptr<HttpListenSocket> listen_socket_;
+  scoped_ptr<HttpListenSocket> listen_socket_;
   int port_;
   GURL base_url_;
 
   // Owns the HttpConnection objects.
   std::map<StreamListenSocket*, HttpConnection*> connections_;
 
   // Vector of registered request handlers.
   std::vector<HandleRequestCallback> request_handlers_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<EmbeddedTestServer> weak_factory_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServer);
 };
 
 }  // namespace test_servers
 }  // namespace net
 
 #endif  // NET_TEST_EMBEDDED_TEST_SERVER_EMBEDDED_TEST_SERVER_H_