DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways.

content/browser/devtools/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_
+#ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "net/http/http_status_code.h"
 
 class GURL;
 
 namespace base {
 class DictionaryValue;
 class Thread;
 class Value;
 }
 
 namespace content {
+class DevToolsManagerDelegate;
 class DevToolsSocketFactory;
 }
 
 namespace net {
 class IPEndPoint;
 class HttpServerRequestInfo;
 class ServerSocket;
 }
 
-namespace devtools_http_handler {
+namespace content {
 
 class DevToolsAgentHostClientImpl;
 class DevToolsHttpHandlerDelegate;
 class ServerWrapper;
 
 // This class is used for managing DevTools remote debugging server.
 // Clients can connect to the specified ip:port and start debugging
 // this browser.
 class DevToolsHttpHandler {
  public:
-  // Takes ownership over |socket_factory| and |delegate|.
+  // Takes ownership over |socket_factory|.
   // 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.
   DevToolsHttpHandler(
-      std::unique_ptr<content::DevToolsSocketFactory> server_socket_factory,
+      DevToolsManagerDelegate* delegate,
+      std::unique_ptr<DevToolsSocketFactory> server_socket_factory,
       const std::string& frontend_url,
-      DevToolsHttpHandlerDelegate* 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();
 
  private:
   friend class ServerWrapper;
   friend void ServerStartedOnUI(
       base::WeakPtr<DevToolsHttpHandler> handler,
       base::Thread* thread,
       ServerWrapper* server_wrapper,
-      content::DevToolsSocketFactory* socket_factory,
+      DevToolsSocketFactory* socket_factory,
       std::unique_ptr<net::IPEndPoint> ip_address);
 
   void OnJsonRequest(int connection_id,
                      const net::HttpServerRequestInfo& info);
   void OnDiscoveryPageRequest(int connection_id);
   void OnFrontendResourceRequest(int connection_id, const std::string& path);
   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,
-                     content::DevToolsSocketFactory* socket_factory,
+                     DevToolsSocketFactory* socket_factory,
                      std::unique_ptr<net::IPEndPoint> ip_address);
 
-  scoped_refptr<content::DevToolsAgentHost> GetAgentHost(
+  scoped_refptr<DevToolsAgentHost> GetAgentHost(
       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);
 
   std::unique_ptr<base::DictionaryValue> SerializeDescriptor(
-      scoped_refptr<content::DevToolsAgentHost> agent_host,
+      scoped_refptr<DevToolsAgentHost> agent_host,
       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_;
   std::unique_ptr<net::IPEndPoint> server_ip_address_;
   typedef std::map<int, DevToolsAgentHostClientImpl*> ConnectionToClientMap;
   ConnectionToClientMap connection_to_client_;
-  const std::unique_ptr<DevToolsHttpHandlerDelegate> delegate_;
-  content::DevToolsSocketFactory* socket_factory_;
+  DevToolsManagerDelegate* delegate_;
+  DevToolsSocketFactory* socket_factory_;
   using DescriptorMap =
-      std::map<std::string, scoped_refptr<content::DevToolsAgentHost>>;
+      std::map<std::string, scoped_refptr<DevToolsAgentHost>>;
   DescriptorMap agent_host_map_;
   base::WeakPtrFactory<DevToolsHttpHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsHttpHandler);
 };
 
-}  // namespace devtools_http_handler
+}  // namespace content
 
-#endif  // COMPONENTS_DEVTOOLS_HTTP_HANDLER_DEVTOOLS_HTTP_HANDLER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_HTTP_HANDLER_H_