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

chromecast/browser/devtools/remote_debugging_server.cc

 // Copyright 2014 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 "chromecast/browser/devtools/remote_debugging_server.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #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/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"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/devtools_auth.h"
 #include "net/socket/unix_domain_server_socket_posix.h"
 #endif  // defined(OS_ANDROID)
 
-using devtools_http_handler::DevToolsHttpHandler;
-
 namespace chromecast {
 namespace shell {
 
 namespace {
 
 const char kFrontEndURL[] =
     "https://chrome-devtools-frontend.appspot.com/serve_rev/%s/inspector.html";
 const uint16_t kDefaultRemoteDebuggingPort = 9222;
 
 const int kBackLog = 10;
@@ skipping 72 matching lines @@
 #endif
 }
 
 std::string GetFrontendUrl() {
   return base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str());
 }
 
 }  // 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(),
                      base::Bind(&RemoteDebuggingServer::OnEnabledChanged,
                                 base::Unretained(this)));
 
   std::string port_str =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kRemoteDebuggingPort);
   if (!port_str.empty()) {
@@ skipping 11 matching lines @@
   OnEnabledChanged();
 }
 
 RemoteDebuggingServer::~RemoteDebuggingServer() {
   pref_enabled_.SetValue(false);
   OnEnabledChanged();
 }
 
 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();
   }
 }
 
 }  // namespace shell
 }  // namespace chromecast