[DevTools] Cleanup DevToolsTarget and DevToolsManagerDelegate after moving to devtools_discovery.

components/devtools_http_handler/devtools_http_handler.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 COMPONENTS_DEVTOOLS_HTTP_HANDLER_DEVTOOLS_HTTP_HANDLER_H_
 #define COMPONENTS_DEVTOOLS_HTTP_HANDLER_DEVTOOLS_HTTP_HANDLER_H_
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "content/public/browser/devtools_manager_delegate.h"
+#include "components/devtools_discovery/devtools_target_descriptor.h"
 #include "net/http/http_status_code.h"
 
 class GURL;
 
 namespace base {
 class Thread;
 class Value;
 }
 
 namespace net {
@@ skipping 32 matching lines @@
   };
 
   // Takes ownership over |socket_factory| and |delegate|.
   // If |frontend_url| is empty, assumes it's bundled, and uses
   // |delegate->GetFrontendResource()|.
   // |delegate| is only accessed on UI thread.
   // If |active_port_output_directory| is non-empty, it is assumed the
   // socket_factory was initialized with an ephemeral port (0). The
   // port selected by the OS will be written to a well-known file in
   // the output directory.
-  // TODO(dgozman): remove |manager_delegate| by moving targets to another
-  // component (http://crbug.com/476496).
   DevToolsHttpHandler(
       scoped_ptr<ServerSocketFactory> server_socket_factory,
       const std::string& frontend_url,
       DevToolsHttpHandlerDelegate* delegate,
-      content::DevToolsManagerDelegate* manager_delegate,
       const base::FilePath& active_port_output_directory,
       const base::FilePath& debug_frontend_dir,
       const std::string& product_name,
       const std::string& user_agent);
   ~DevToolsHttpHandler();
 
   // Returns the URL for the file at |path| in frontend.
   GURL GetFrontendURL(const std::string& path);
 
  private:
@@ skipping 13 matching lines @@
   void OnWebSocketRequest(int connection_id,
                           const net::HttpServerRequestInfo& info);
   void OnWebSocketMessage(int connection_id, const std::string& data);
   void OnClose(int connection_id);
 
   void ServerStarted(base::Thread* thread,
                      ServerWrapper* server_wrapper,
                      ServerSocketFactory* socket_factory,
                      scoped_ptr<net::IPEndPoint> ip_address);
 
-  static void OnTargetListReceivedWeak(
-      base::WeakPtr<DevToolsHttpHandler> handler,
-      int connection_id,
-      const std::string& host,
-      const content::DevToolsManagerDelegate::TargetList& targets);
-  void OnTargetListReceived(
-      int connection_id,
-      const std::string& host,
-      const content::DevToolsManagerDelegate::TargetList& targets);
-
-  content::DevToolsTarget* GetTarget(const std::string& id);
+  devtools_discovery::DevToolsTargetDescriptor* GetDescriptor(
+      const std::string& target_id);
 
   void SendJson(int connection_id,
                 net::HttpStatusCode status_code,
                 base::Value* value,
                 const std::string& message);
   void Send200(int connection_id,
                const std::string& data,
                const std::string& mime_type);
   void Send404(int connection_id);
   void Send500(int connection_id,
                const std::string& message);
   void AcceptWebSocket(int connection_id,
                        const net::HttpServerRequestInfo& request);
 
   // Returns the front end url without the host at the beginning.
   std::string GetFrontendURLInternal(const std::string target_id,
                                      const std::string& host);
 
-  base::DictionaryValue* SerializeTarget(const content::DevToolsTarget& target,
-                                         const std::string& host);
+  base::DictionaryValue* SerializeDescriptor(
+      const devtools_discovery::DevToolsTargetDescriptor& descriptor,
+      const std::string& host);
 
   // The thread used by the devtools handler to run server socket.
   base::Thread* thread_;
   std::string frontend_url_;
   std::string product_name_;
   std::string user_agent_;
   ServerWrapper* server_wrapper_;
   scoped_ptr<net::IPEndPoint> server_ip_address_;
   typedef std::map<int, DevToolsAgentHostClientImpl*> ConnectionToClientMap;
   ConnectionToClientMap connection_to_client_;
   const scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
-  content::DevToolsManagerDelegate* manager_delegate_;
   ServerSocketFactory* socket_factory_;
-  typedef std::map<std::string, content::DevToolsTarget*> TargetMap;
-  TargetMap target_map_;
+  using DescriptorMap =
+      std::map<std::string, devtools_discovery::DevToolsTargetDescriptor*>;
+  DescriptorMap descriptor_map_;
   base::WeakPtrFactory<DevToolsHttpHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandler);
 };
 
 }  // namespace devtools_http_handler
 
 #endif  // COMPONENTS_DEVTOOLS_HTTP_HANDLER_DEVTOOLS_HTTP_HANDLER_H_