Extract debugger target enumeration into a separate class

content/browser/devtools/devtools_http_handler_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
 #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 23 matching lines @@
 
 class DevToolsBrowserTarget;
 class DevToolsClientHost;
 
 class DevToolsHttpHandlerImpl
     : public DevToolsHttpHandler,
       public NotificationObserver,
       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,
                           const std::string& frontend_url,
                           DevToolsHttpHandlerDelegate* delegate);
   virtual ~DevToolsHttpHandlerImpl();
   void Start();
 
   // DevToolsHttpHandler implementation.
   virtual void Stop() OVERRIDE;
@@ skipping 49 matching lines @@
                const std::string& message);
   void AcceptWebSocket(int connection_id,
                        const net::HttpServerRequestInfo& request);
 
   PageList GeneratePageList();
 
   // Returns the front end url without the host at the beginning.
   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.
   scoped_ptr<base::Thread> thread_;
 
   std::string overridden_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_;
   scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
   DevToolsAgentHostBinding* binding_;
-  scoped_ptr<DevToolsAgentHostBinding> default_binding_;
   NotificationRegistrar registrar_;
   scoped_ptr<DevToolsBrowserTarget> browser_target_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandlerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_IMPL_H_