DevTools: Extract target discovery and manipulation from DevToolsHttpHandlerImpl

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 f7ccca02d45ab4c7bb5c9022c6c547eb4e9f1343..ee5ebb9a7d24ec6112a29f7757a5a6eddd040db6 100644
--- a/content/browser/devtools/devtools_http_handler_impl.h
+++ b/content/browser/devtools/devtools_http_handler_impl.h
@@ -15,7 +15,6 @@
 #include "content/common/content_export.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/devtools_http_handler_delegate.h"
-#include "content/public/browser/worker_service.h"
 #include "net/http/http_status_code.h"
 #include "net/server/http_server.h"
 
@@ -44,6 +43,9 @@ class DevToolsHttpHandlerImpl
   friend class base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>;
   friend class DevToolsHttpHandler;
 
+  typedef DevToolsHttpHandlerDelegate::Target Target;
+  typedef DevToolsHttpHandlerDelegate::TargetList TargetList;
+
   // Takes ownership over |socket_factory|.
   DevToolsHttpHandlerImpl(const net::StreamListenSocketFactory* socket_factory,
                           const std::string& frontend_url,
@@ -53,8 +55,6 @@ class DevToolsHttpHandlerImpl
 
   // DevToolsHttpHandler implementation.
   virtual void Stop() OVERRIDE;
-  virtual void SetDevToolsAgentHostBinding(
-      DevToolsAgentHostBinding* binding) OVERRIDE;
   virtual GURL GetFrontendURL(DevToolsAgentHost* agent_host) OVERRIDE;
 
   // net::HttpServer::Delegate implementation.
@@ -69,7 +69,7 @@ class DevToolsHttpHandlerImpl
 
   void OnJsonRequestUI(int connection_id,
                        const net::HttpServerRequestInfo& info);
-  void OnThumbnailRequestUI(int connection_id, const GURL& page_url);
+  void OnThumbnailRequestUI(int connection_id, const std::string& target_id);
   void OnDiscoveryPageRequestUI(int connection_id);
 
   void OnWebSocketRequestUI(int connection_id,
@@ -80,8 +80,9 @@ class DevToolsHttpHandlerImpl
   void ResetHandlerThread();
   void ResetHandlerThreadAndRelease();
 
-  void CollectWorkerInfo(base::ListValue* target_list, std::string host);
-  void SendTargetList(int connection_id, base::ListValue* target_list);
+  void SendTargetList(int connection_id,
+                      const std::string& host,
+                      const TargetList& targets);
 
   void Init();
   void Teardown();
@@ -103,19 +104,11 @@ class DevToolsHttpHandlerImpl
                        const net::HttpServerRequestInfo& request);
 
   // Returns the front end url without the host at the beginning.
-  std::string GetFrontendURLInternal(const std::string rvh_id,
+  std::string GetFrontendURLInternal(const std::string target_id,
                                      const std::string& host);
 
-  base::DictionaryValue* SerializePageInfo(RenderViewHost* rvh,
-                                           const std::string& host);
-
-  base::DictionaryValue* SerializeWorkerInfo(
-      const WorkerService::WorkerInfo& worker,
-      const std::string& host);
-
-  void SerializeDebuggerURLs(base::DictionaryValue* dictionary,
-                             const std::string& id,
-                             const std::string& host);
+  base::DictionaryValue* Serialize(const Target& target,
+                                   const std::string& host);
 
   // The thread used by the devtools handler to run server socket.
   scoped_ptr<base::Thread> thread_;
@@ -125,9 +118,7 @@ class DevToolsHttpHandlerImpl
   scoped_refptr<net::HttpServer> server_;
   typedef std::map<int, DevToolsClientHost*> ConnectionToClientHostMap;
   ConnectionToClientHostMap connection_to_client_host_ui_;
-  scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
-  DevToolsAgentHostBinding* binding_;
-  scoped_ptr<DevToolsAgentHostBinding> default_binding_;
+  scoped_refptr<DevToolsHttpHandlerDelegate> delegate_;
   scoped_refptr<DevToolsBrowserTarget> browser_target_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl);
 };