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

chromecast/browser/devtools/remote_debugging_server.cc

Index: chromecast/browser/devtools/remote_debugging_server.cc
diff --git a/chromecast/browser/devtools/remote_debugging_server.cc b/chromecast/browser/devtools/remote_debugging_server.cc
index 7fdf8a3dc79bc7993696808120b8030a944d83e4..54c4e6c5b73b17df67d9bb9eca7d547275e200ab 100644
--- a/chromecast/browser/devtools/remote_debugging_server.cc
+++ b/chromecast/browser/devtools/remote_debugging_server.cc
@@ -14,11 +14,11 @@
 #include "build/build_config.h"
 #include "chromecast/base/pref_names.h"
 #include "chromecast/browser/cast_browser_process.h"
-#include "chromecast/browser/devtools/cast_dev_tools_delegate.h"
+#include "chromecast/browser/devtools/cast_devtools_delegate.h"
 #include "chromecast/common/cast_content_client.h"
-#include "components/devtools_http_handler/devtools_http_handler.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_socket_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
@@ -30,8 +30,6 @@
 #include "net/socket/unix_domain_server_socket_posix.h"
 #endif  // defined(OS_ANDROID)
 
-using devtools_http_handler::DevToolsHttpHandler;
-
 namespace chromecast {
 namespace shell {
 
@@ -124,7 +122,8 @@ std::string GetFrontendUrl() {
 }  // namespace
 
 RemoteDebuggingServer::RemoteDebuggingServer(bool start_immediately)
-    : port_(kDefaultRemoteDebuggingPort) {
+    : port_(kDefaultRemoteDebuggingPort),
+      is_started_(false) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   pref_enabled_.Init(prefs::kEnableRemoteDebugging,
                      CastBrowserProcess::GetInstance()->pref_service(),
@@ -156,19 +155,19 @@ RemoteDebuggingServer::~RemoteDebuggingServer() {
 
 void RemoteDebuggingServer::OnEnabledChanged() {
   bool enabled = *pref_enabled_ && port_ != 0;
-  if (enabled && !devtools_http_handler_) {
-    devtools_http_handler_.reset(new DevToolsHttpHandler(
+  if (enabled && !is_started_) {
+    content::DevToolsAgentHost::StartRemoteDebuggingServer(
         CreateSocketFactory(port_),
         GetFrontendUrl(),
-        new CastDevToolsDelegate(),
         base::FilePath(),
         base::FilePath(),
         std::string(),
-        GetUserAgent()));
+        GetUserAgent());
     LOG(INFO) << "Devtools started: port=" << port_;
-  } else if (!enabled && devtools_http_handler_) {
+  } else if (!enabled && is_started_) {
     LOG(INFO) << "Stop devtools: port=" << port_;
-    devtools_http_handler_.reset();
+    is_started_ = false;
+    content::DevToolsAgentHost::StopRemoteDebuggingServer();
   }
 }