1 files changed, 25 insertions, 26 deletions

diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.h b/chrome/browser/debugger/devtools_http_protocol_handler.h
index 1bb4726..bfa2de8 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.h
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.h
@@ -12,7 +12,7 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "net/server/http_listen_socket.h"
+#include "net/server/http_server.h"
 #include "net/url_request/url_request.h"
 
 class DevToolsClientHost;
@@ -21,7 +21,7 @@ class TabContents;
 class TabContentsWrapper;
 
 class DevToolsHttpProtocolHandler
-    : public HttpListenSocket::Delegate,
+    : public HttpServer::Delegate,
       public net::URLRequest::Delegate,
       public base::RefCountedThreadSafe<DevToolsHttpProtocolHandler> {
  public:
@@ -54,22 +54,22 @@ class DevToolsHttpProtocolHandler
   virtual ~DevToolsHttpProtocolHandler();
   void Start();
 
-  // HttpListenSocket::Delegate implementation.
-  virtual void OnHttpRequest(HttpListenSocket* socket,
+  // HttpServer::Delegate implementation.
+  virtual void OnHttpRequest(int connection_id,
                              const HttpServerRequestInfo& info);
-  virtual void OnWebSocketRequest(HttpListenSocket* socket,
+  virtual void OnWebSocketRequest(int connection_id,
                                   const HttpServerRequestInfo& info);
-  virtual void OnWebSocketMessage(HttpListenSocket* socket,
+  virtual void OnWebSocketMessage(int connection_id,
                                   const std::string& data);
-  virtual void OnClose(HttpListenSocket* socket);
+  virtual void OnClose(int connection_id);
 
-  virtual void OnHttpRequestUI(HttpListenSocket* socket,
+  virtual void OnHttpRequestUI(int connection_id,
                                const HttpServerRequestInfo& info);
-  virtual void OnWebSocketRequestUI(HttpListenSocket* socket,
+  virtual void OnWebSocketRequestUI(int connection_id,
                                     const HttpServerRequestInfo& info);
-  virtual void OnWebSocketMessageUI(HttpListenSocket* socket,
+  virtual void OnWebSocketMessageUI(int connection_id,
                                     const std::string& data);
-  virtual void OnCloseUI(HttpListenSocket* socket);
+  virtual void OnCloseUI(int connection_id);
 
   // net::URLRequest::Delegate implementation.
   virtual void OnResponseStarted(net::URLRequest* request);
@@ -77,36 +77,35 @@ class DevToolsHttpProtocolHandler
 
   void Init();
   void Teardown();
-  void Bind(net::URLRequest* request, HttpListenSocket* socket);
+  void Bind(net::URLRequest* request, int connection_id);
   void RequestCompleted(net::URLRequest* request);
 
-  void Send200(HttpListenSocket* socket,
+  void Send200(int connection_id,
                const std::string& data,
                const std::string& mime_type = "text/html");
-  void Send404(HttpListenSocket* socket);
-  void Send500(HttpListenSocket* socket,
+  void Send404(int connection_id);
+  void Send500(int connection_id,
                const std::string& message);
-  void AcceptWebSocket(HttpListenSocket* socket,
+  void AcceptWebSocket(int connection_id,
                        const HttpServerRequestInfo& request);
-  void ReleaseSocket(HttpListenSocket* socket);
 
   TabContents* GetTabContents(int session_id);
 
   int port_;
   std::string overriden_frontend_url_;
-  scoped_refptr<HttpListenSocket> server_;
-  typedef std::map<net::URLRequest*, HttpListenSocket*>
+  scoped_refptr<HttpServer> server_;
+  typedef std::map<net::URLRequest*, int>
       RequestToSocketMap;
-  RequestToSocketMap request_to_socket_io_;
-  typedef std::map<HttpListenSocket*, std::set<net::URLRequest*> >
-      SocketToRequestsMap;
-  SocketToRequestsMap socket_to_requests_io_;
+  RequestToSocketMap request_to_connection_io_;
+  typedef std::map<int, std::set<net::URLRequest*> >
+      ConnectionToRequestsMap;
+  ConnectionToRequestsMap connection_to_requests_io_;
   typedef std::map<net::URLRequest*, scoped_refptr<net::IOBuffer> >
       BuffersMap;
   BuffersMap request_to_buffer_io_;
-  typedef std::map<HttpListenSocket*, DevToolsClientHost*>
-      SocketToClientHostMap;
-  SocketToClientHostMap socket_to_client_host_ui_;
+  typedef std::map<int, DevToolsClientHost*>
+      ConnectionToClientHostMap;
+  ConnectionToClientHostMap connection_to_client_host_ui_;
   scoped_ptr<TabContentsProvider> tab_contents_provider_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsHttpProtocolHandler);
 };