Remove ref-counting from StreamListenSocket

net/server/http_server.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/server/http_server.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 74 matching lines @@
   // Initiating close from server-side does not lead to the DidClose call.
   // Do it manually here.
   DidClose(connection->socket_.get());
 }
 
 int HttpServer::GetLocalAddress(IPEndPoint* address) {
   return server_->GetLocalAddress(address);
 }
 
 void HttpServer::DidAccept(StreamListenSocket* server,
-                           StreamListenSocket* socket) {
-  HttpConnection* connection = new HttpConnection(this, socket);
+                           scoped_ptr<StreamListenSocket> socket) {
+  HttpConnection* connection = new HttpConnection(this, socket.Pass());
   id_to_connection_[connection->id()] = connection;
-  socket_to_connection_[socket] = connection;
+  // TODO(szym): Fix socket access. Make HttpConnection the Delegate.
+  socket_to_connection_[connection->socket_.get()] = connection;
 }
 
 void HttpServer::DidRead(StreamListenSocket* socket,
                          const char* data,
                          int len) {
   HttpConnection* connection = FindConnection(socket);
   DCHECK(connection != NULL);
   if (connection == NULL)
     return;
 
@@ skipping 41 matching lines @@
   HttpConnection* connection = FindConnection(socket);
   DCHECK(connection != NULL);
   id_to_connection_.erase(connection->id());
   socket_to_connection_.erase(connection->socket_.get());
   delete connection;
 }
 
 HttpServer::~HttpServer() {
   STLDeleteContainerPairSecondPointers(
       id_to_connection_.begin(), id_to_connection_.end());
-  server_ = NULL;
 }
 
 //
 // HTTP Request Parser
 // This HTTP request parser uses a simple state machine to quickly parse
 // through the headers.  The parser is not 100% complete, as it is designed
 // for use in this simple test driver.
 //
 // Known issues:
 //   - does not handle whitespace on first HTTP line correctly.  Expects
@@ skipping 128 matching lines @@
 }
 
 HttpConnection* HttpServer::FindConnection(StreamListenSocket* socket) {
   SocketToConnectionMap::iterator it = socket_to_connection_.find(socket);
   if (it == socket_to_connection_.end())
     return NULL;
   return it->second;
 }
 
 }  // namespace net