Decouple DevTools from socket implementation.

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/string_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_byteorder.h"
 #include "build/build_config.h"
 #include "net/base/tcp_listen_socket.h"
 #include "net/server/http_connection.h"
 #include "net/server/http_server_request_info.h"
 #include "net/server/web_socket.h"
 
 namespace net {
 
-HttpServer::HttpServer(const std::string& host,
-                       int port,
-                       HttpServer::Delegate* del)
-    : delegate_(del) {
-  server_ = TCPListenSocket::CreateAndListen(host, port, this);
+HttpServer::HttpServer(HttpServer::Delegate* delegate,
+                       StreamListenSocketFactory* factory)
+  : delegate_(delegate),
+    ALLOW_THIS_IN_INITIALIZER_LIST(server_(factory->CreateAndListen(this))) {

[mmenke, 2012/05/14 20:45:19]

nit:  Fix indent.

[Philippe, 2012/05/15 14:39:09]

Done.

+  DCHECK(server_);
 }
 
 void HttpServer::AcceptWebSocket(
     int connection_id,
     const HttpServerRequestInfo& request) {
   HttpConnection* connection = FindConnection(connection_id);
   if (connection == NULL)
     return;
 
   DCHECK(connection->web_socket_.get());
@@ skipping 115 matching lines @@
 
 void HttpServer::DidClose(StreamListenSocket* socket) {
   HttpConnection* connection = FindConnection(socket);
   DCHECK(connection != NULL);
   id_to_connection_.erase(connection->id());
   socket_to_connection_.erase(connection->socket_);
   delete connection;
 }
 
 HttpServer::~HttpServer() {
-  IdToConnectionMap copy = id_to_connection_;
-  for (IdToConnectionMap::iterator it = copy.begin(); it != copy.end(); ++it)
-    delete it->second;
-
+  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:
@@ skipping 129 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