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

chrome/browser/devtools/remote_debugging_server.cc

 // 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.
 
 #include "chrome/browser/devtools/remote_debugging_server.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/grit/browser_resources.h"
-#include "components/devtools_http_handler/devtools_http_handler.h"
-#include "components/devtools_http_handler/devtools_http_handler_delegate.h"
 #include "components/version_info/version_info.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/devtools_socket_factory.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 base::LazyInstance<bool>::Leaky g_tethering_enabled = LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 44 matching lines @@
     return CreateLocalHostServerSocket(port);
   }
 
   std::string address_;
   uint16_t port_;
   uint16_t last_tethering_port_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
 };
 
-class ChromeDevToolsHttpHandlerDelegate
-    : public devtools_http_handler::DevToolsHttpHandlerDelegate {
- public:
-  ChromeDevToolsHttpHandlerDelegate();
-  ~ChromeDevToolsHttpHandlerDelegate() override;
-
-  // devtools_http_handler::DevToolsHttpHandlerDelegate implementation.
-  std::string GetDiscoveryPageHTML() override;
-  std::string GetFrontendResource(const std::string& path) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeDevToolsHttpHandlerDelegate);
-};
-
-ChromeDevToolsHttpHandlerDelegate::ChromeDevToolsHttpHandlerDelegate() {
-}
-
-ChromeDevToolsHttpHandlerDelegate::~ChromeDevToolsHttpHandlerDelegate() {
-}
-
-std::string ChromeDevToolsHttpHandlerDelegate::GetDiscoveryPageHTML() {
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
-}
-
-std::string ChromeDevToolsHttpHandlerDelegate::GetFrontendResource(
-    const std::string& path) {
-  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
-}
-
 }  // namespace
 
 // static
 void RemoteDebuggingServer::EnableTetheringForDebug() {
   g_tethering_enabled.Get() = true;
 }
 
 RemoteDebuggingServer::RemoteDebuggingServer(const std::string& ip,
                                              uint16_t port) {
   base::FilePath output_dir;
   if (!port) {
     // The client requested an ephemeral port. Must write the selected
     // port to a well-known location in the profile directory to
     // bootstrap the connection process.
     bool result = PathService::Get(chrome::DIR_USER_DATA, &output_dir);
     DCHECK(result);
   }
 
   base::FilePath debug_frontend_dir;
 #if defined(DEBUG_DEVTOOLS)
   PathService::Get(chrome::DIR_INSPECTOR, &debug_frontend_dir);
 #endif
 
-  devtools_http_handler_.reset(new devtools_http_handler::DevToolsHttpHandler(
-      base::WrapUnique(new TCPServerSocketFactory(ip, port)), std::string(),
-      new ChromeDevToolsHttpHandlerDelegate(), output_dir, debug_frontend_dir,
-      version_info::GetProductNameAndVersionForUserAgent(), ::GetUserAgent()));
+  content::DevToolsAgentHost::StartRemoteDebuggingServer(
+      base::WrapUnique(new TCPServerSocketFactory(ip, port)),
+      std::string(),
+      output_dir,
+      debug_frontend_dir,
+      version_info::GetProductNameAndVersionForUserAgent(),
+      ::GetUserAgent());
 }
 
 RemoteDebuggingServer::~RemoteDebuggingServer() {
   // Ensure Profile is alive, because the whole DevTools subsystem
   // accesses it during shutdown.
   DCHECK(g_browser_process->profile_manager());
+  content::DevToolsAgentHost::StopRemoteDebuggingServer();
 }