Extract debugger target enumeration into a separate class

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 dd027eee63bd150f8d929591f5a981b9d02e8d2f..aa2d75a6a4d50f6701a0689db0f0c9db3786fe14 100644
--- a/content/browser/devtools/devtools_http_handler_impl.h
+++ b/content/browser/devtools/devtools_http_handler_impl.h
@@ -41,12 +41,12 @@ class DevToolsHttpHandlerImpl
       public base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>,
       public net::HttpServer::Delegate {
  private:
-  struct PageInfo;
-  typedef std::vector<PageInfo> PageList;
+  typedef std::vector<DevToolsAgentHost*> PageList;

[pfeldman, 2013/03/01 08:49:30]

Vector of serialized value types was Ok, but now you are managing vector of raw
pointers that can be freed at any time. I.e. you can only use it synchronously.
I would not typedef it, but explicitly drag it everywhere for clarity.

[Vladislav Kaznacheev, 2013/03/01 12:58:35]

Inlined all manipulations with this list at the single place where they are
done.

On 2013/03/01 08:49:30, pfeldman wrote:

   friend class base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>;
   friend class DevToolsHttpHandler;
 
-  static bool SortPageListByTime(const PageInfo& info1, const PageInfo& info2);
+  static bool SortPageListByTime(DevToolsAgentHost* agent_host1,

[pfeldman, 2013/03/01 08:49:30]

Since you are touching it - TimeComparator

[Vladislav Kaznacheev, 2013/03/01 12:58:35]

Done.

+                                 DevToolsAgentHost* agent_host2);
 
   // Takes ownership over |socket_factory|.
   DevToolsHttpHandlerImpl(const net::StreamListenSocketFactory* socket_factory,
@@ -116,10 +116,7 @@ class DevToolsHttpHandlerImpl
   std::string GetFrontendURLInternal(const std::string rvh_id,
                                      const std::string& host);
 
-  PageInfo CreatePageInfo(RenderViewHost* rvh,
-                          DevToolsHttpHandlerDelegate::TargetType type);
-
-  base::DictionaryValue* SerializePageInfo(const PageInfo& page_info,
+  base::DictionaryValue* SerializePageInfo(DevToolsAgentHost* agent_host,
                                            const std::string& host);
 
   // The thread used by the devtools handler to run server socket.
@@ -132,7 +129,6 @@ class DevToolsHttpHandlerImpl
   ConnectionToClientHostMap connection_to_client_host_ui_;
   scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
   DevToolsAgentHostBinding* binding_;
-  scoped_ptr<DevToolsAgentHostBinding> default_binding_;
   NotificationRegistrar registrar_;
   scoped_ptr<DevToolsBrowserTarget> browser_target_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl);