[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

content/browser/devtools/devtools_http_handler_impl.h

Index: content/browser/devtools/devtools_http_handler_impl.h
diff --git a/content/browser/devtools/devtools_http_handler_impl.h b/content/browser/devtools/devtools_http_handler_impl.h
index 0d08d9897aa2e3fd05c065d28e74a8d54973a611..114821c195cf9fa801b57418df2f367abdbe8747 100644
--- a/content/browser/devtools/devtools_http_handler_impl.h
+++ b/content/browser/devtools/devtools_http_handler_impl.h
@@ -13,6 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/devtools_http_handler_delegate.h"
 #include "net/http/http_status_code.h"
@@ -33,7 +34,6 @@ class URLRequestContextGetter;
 namespace content {
 
 class DevToolsBrowserTarget;
-class DevToolsClientHost;
 
 class DevToolsHttpHandlerImpl
     : public DevToolsHttpHandler,
@@ -119,8 +119,8 @@ class DevToolsHttpHandlerImpl
   std::string frontend_url_;
   scoped_ptr<const net::StreamListenSocketFactory> socket_factory_;
   scoped_refptr<net::HttpServer> server_;
-  typedef std::map<int, DevToolsClientHost*> ConnectionToClientHostMap;
-  ConnectionToClientHostMap connection_to_client_host_ui_;
+  typedef std::map<int, DevToolsAgentHost::Client*> ConnectionToClientMap;
+  ConnectionToClientMap connection_to_client_ui_;
   scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
   base::FilePath active_port_output_directory_;
   typedef std::map<std::string, DevToolsTarget*> TargetMap;