Remove ref-counting from StreamListenSocket

chrome_frame/test/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 CHROME_FRAME_TEST_TEST_SERVER_H_
 #define CHROME_FRAME_TEST_TEST_SERVER_H_
 
 // Implementation of an HTTP server for tests.
 // To instantiate the server, make sure you have a message loop on the
 // current thread and then create an instance of the SimpleWebServer class.
@@ skipping 89 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(Request);
 };
 
 // Manages request headers for a single request.
 // For each successful request that's made, the server will keep an instance
 // of this class so that they can be checked even after the server has been
 // shut down.
 class Connection {
  public:
-  explicit Connection(net::StreamListenSocket* sock) : socket_(sock) {
+  explicit Connection(scoped_ptr<net::StreamListenSocket> sock)
+      : socket_(sock.Pass()) {
   }
 
   ~Connection() {
   }
 
   bool IsSame(const net::StreamListenSocket* socket) const {
     return socket_ == socket;
   }
 
   const Request& request() const {
     return request_;
   }
 
   Request& request() {
     return request_;
   }
 
   void OnSocketClosed() {
-    socket_ = NULL;
+    socket_.reset();
   }
 
  protected:
-  scoped_refptr<net::StreamListenSocket> socket_;
+  scoped_ptr<net::StreamListenSocket> socket_;
   Request request_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Connection);
 };
 
 // Abstract interface with default implementations for some of the methods and
 // a counter for how many times the response object has served requests.
 class Response {
  public:
@@ skipping 152 matching lines @@
   // Ownership of response objects is by default assumed to be outside
   // of the SimpleWebServer class.
   // However, if the caller doesn't wish to maintain a list of response objects
   // but rather let this class hold the only references to those objects,
   // the caller can call this method to delete the objects as part of
   // the cleanup process.
   void DeleteAllResponses();
 
   // StreamListenSocket::Delegate overrides.
   virtual void DidAccept(net::StreamListenSocket* server,
-                         net::StreamListenSocket* connection);
+                         scoped_ptr<net::StreamListenSocket> connection);
   virtual void DidRead(net::StreamListenSocket* connection,
                        const char* data,
                        int len);
   virtual void DidClose(net::StreamListenSocket* sock);
 
   // Returns the host on which the server is listening.  This is suitable for
   // use in URLs for resources served by this instance.
   const std::string& host() const {
     return host_;
   }
@@ skipping 12 matching lines @@
     virtual void WriteContents(net::StreamListenSocket* socket) const {
       SimpleResponse::WriteContents(socket);
       base::MessageLoop::current()->Quit();
     }
   };
 
   Response* FindResponse(const Request& request) const;
   Connection* FindConnection(const net::StreamListenSocket* socket) const;
 
   std::string host_;
-  scoped_refptr<net::StreamListenSocket> server_;
+  scoped_ptr<net::StreamListenSocket> server_;
   ConnectionList connections_;
   std::list<Response*> responses_;
   QuitResponse quit_;
 
  private:
   void Construct(const std::string& address, int port);
   DISALLOW_COPY_AND_ASSIGN(SimpleWebServer);
 };
 
 // Simple class holding incoming HTTP request. Can send the HTTP response
 // at different rate - small chunks, on regular interval.
 class ConfigurableConnection : public base::RefCounted<ConfigurableConnection> {
  public:
   struct SendOptions {
     enum Speed { IMMEDIATE, DELAYED, IMMEDIATE_HEADERS_DELAYED_CONTENT };
     SendOptions() : speed_(IMMEDIATE), chunk_size_(0), timeout_(0) { }
     SendOptions(Speed speed, int chunk_size, int64 timeout)
         : speed_(speed), chunk_size_(chunk_size), timeout_(timeout) {
     }
 
     Speed speed_;
     int chunk_size_;
     int64 timeout_;
   };
 
-  explicit ConfigurableConnection(net::StreamListenSocket* sock)
-      : socket_(sock),
+  explicit ConfigurableConnection(scoped_ptr<net::StreamListenSocket> sock)
+      : socket_(sock.Pass()),
         cur_pos_(0) {}
 
   // Send HTTP response with provided |headers| and |content|. Appends
   // "Context-Length:" header if the |content| is not empty.
   void Send(const std::string& headers, const std::string& content);
 
   // Send HTTP response with provided |headers| and |content|. Appends
   // "Context-Length:" header if the |content| is not empty.
   // Use the |options| to tweak the network speed behaviour.
   void SendWithOptions(const std::string& headers, const std::string& content,
                        const SendOptions& options);
 
  private:
   friend class HTTPTestServer;
   // Sends a chunk of the response and queues itself as a task for sending
   // next chunk of |data_|.
   void SendChunk();
 
   // Closes the connection by releasing this instance's reference on its socket.
   void Close();
 
-  scoped_refptr<net::StreamListenSocket> socket_;
+  scoped_ptr<net::StreamListenSocket> socket_;
   Request r_;
   SendOptions options_;
   std::string data_;
   int cur_pos_;
 
   DISALLOW_COPY_AND_ASSIGN(ConfigurableConnection);
 };
 
 // Simple class used as a base class for mock webserver.
 // Override virtual functions Get and Post and use passed ConfigurableConnection
@@ skipping 26 matching lines @@
 
  private:
   typedef std::list<scoped_refptr<ConfigurableConnection> > ConnectionList;
   ConnectionList::iterator FindConnection(
       const net::StreamListenSocket* socket);
   scoped_refptr<ConfigurableConnection> ConnectionFromSocket(
       const net::StreamListenSocket* socket);
 
   // StreamListenSocket::Delegate overrides.
   virtual void DidAccept(net::StreamListenSocket* server,
-                         net::StreamListenSocket* socket);
+                         scoped_ptr<net::StreamListenSocket> socket);
   virtual void DidRead(net::StreamListenSocket* socket,
                        const char* data, int len);
   virtual void DidClose(net::StreamListenSocket* socket);
 
-  scoped_refptr<net::StreamListenSocket> server_;
+  scoped_ptr<net::StreamListenSocket> server_;
   ConnectionList connection_list_;
 
   DISALLOW_COPY_AND_ASSIGN(HTTPTestServer);
 };
 
 }  // namespace test_server
 
 #endif  // CHROME_FRAME_TEST_TEST_SERVER_H_