Decouple DevTools from socket implementation.

This is part of Chrome for Android upstreaming.

This will let us use a UnixDomainSocket for DevTools on Android.

Note that this CL depends on CL 10161005 (which should land soon).

TEST=net_unittests

Review URL: https://chromiumcodereview.appspot.com/10386048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138497 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 9 deletions

diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index 51ec79f..2e12d17 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -17,11 +18,11 @@
 
 namespace net {
 
-HttpServer::HttpServer(const std::string& host,
-                       int port,
-                       HttpServer::Delegate* del)
-    : delegate_(del) {
-  server_ = TCPListenSocket::CreateAndListen(host, port, this);
+HttpServer::HttpServer(const StreamListenSocketFactory& factory,
+                       HttpServer::Delegate* delegate)
+    : delegate_(delegate),
+      ALLOW_THIS_IN_INITIALIZER_LIST(server_(factory.CreateAndListen(this))) {
+  DCHECK(server_);
 }
 
 void HttpServer::AcceptWebSocket(
@@ -157,10 +158,8 @@ void HttpServer::DidClose(StreamListenSocket* socket) {
 }
 
 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;
 }