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

content/shell/browser/shell_devtools_manager_delegate.cc

 // Copyright 2013 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 "content/shell/browser/shell_devtools_manager_delegate.h"
 
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "components/devtools_http_handler/devtools_http_handler.h"
 #include "content/public/browser/browser_context.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 "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/shell_content_client.h"
 #include "grit/shell_resources.h"
 #include "net/base/net_errors.h"
 #include "net/socket/tcp_server_socket.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/devtools_auth.h"
 #include "net/socket/unix_domain_server_socket_posix.h"
 #endif
 
-using devtools_http_handler::DevToolsHttpHandler;
-
 namespace content {
 
 namespace {
 
 #if defined(OS_ANDROID)
 const char kFrontEndURL[] =
     "http://chrome-devtools-frontend.appspot.com/serve_rev/%s/inspector.html";
 #endif
 
 const int kBackLog = 10;
@@ skipping 78 matching lines @@
       port = static_cast<uint16_t>(temp_port);
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << temp_port;
     }
   }
   return std::unique_ptr<content::DevToolsSocketFactory>(
       new TCPServerSocketFactory("127.0.0.1", port));
 #endif
 }
 
-// ShellDevToolsDelegate ----------------------------------------------------
-
-class ShellDevToolsDelegate :
-    public devtools_http_handler::DevToolsHttpHandlerDelegate {
- public:
-  explicit ShellDevToolsDelegate();
-  ~ShellDevToolsDelegate() override;
-
-  // devtools_http_handler::DevToolsHttpHandlerDelegate implementation.
-  std::string GetDiscoveryPageHTML() override;
-  std::string GetFrontendResource(const std::string& path) override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ShellDevToolsDelegate);
-};
-
-ShellDevToolsDelegate::ShellDevToolsDelegate() {
-}
-
-ShellDevToolsDelegate::~ShellDevToolsDelegate() {
-}
-
-std::string ShellDevToolsDelegate::GetDiscoveryPageHTML() {
-#if defined(OS_ANDROID)
-  return std::string();
-#else
-  return ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();
-#endif
-}
-
-std::string ShellDevToolsDelegate::GetFrontendResource(
-    const std::string& path) {
-  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
-}
-
-}  // namespace
+} //  namespace
 
 // ShellDevToolsManagerDelegate ----------------------------------------------
 
 // static
-DevToolsHttpHandler*
-ShellDevToolsManagerDelegate::CreateHttpHandler(
+void ShellDevToolsManagerDelegate::StartHttpHandler(
     BrowserContext* browser_context) {
   std::string frontend_url;
 #if defined(OS_ANDROID)
   frontend_url = base::StringPrintf(kFrontEndURL, GetWebKitRevision().c_str());
 #endif
-  return new DevToolsHttpHandler(
+  DevToolsAgentHost::StartRemoteDebuggingServer(
       CreateSocketFactory(),
       frontend_url,
-      new ShellDevToolsDelegate(),
       browser_context->GetPath(),
       base::FilePath(),
       std::string(),
       GetShellUserAgent());
 }
 
+// static
+void ShellDevToolsManagerDelegate::StopHttpHandler() {
+  DevToolsAgentHost::StopRemoteDebuggingServer();
+}
+
 ShellDevToolsManagerDelegate::ShellDevToolsManagerDelegate(
     BrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
 ShellDevToolsManagerDelegate::~ShellDevToolsManagerDelegate() {
 }
 
-base::DictionaryValue* ShellDevToolsManagerDelegate::HandleCommand(
-    DevToolsAgentHost* agent_host,
-    base::DictionaryValue* command_dict) {
-  return nullptr;
-}
-
-std::string ShellDevToolsManagerDelegate::GetTargetType(RenderFrameHost* host) {
-  return DevToolsAgentHost::kTypePage;
-}
-
-std::string ShellDevToolsManagerDelegate::GetTargetTitle(
-    RenderFrameHost* host) {
-  return "";
-}
-
-
 scoped_refptr<DevToolsAgentHost>
 ShellDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
   Shell* shell = Shell::CreateNewWindow(browser_context_,
                                         url,
                                         nullptr,
                                         gfx::Size());
   return DevToolsAgentHost::GetOrCreateFor(shell->web_contents());
 }
 
+std::string ShellDevToolsManagerDelegate::GetDiscoveryPageHTML() {
+#if defined(OS_ANDROID)
+  return std::string();
+#else
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+      IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();
+#endif
+}
+
+std::string ShellDevToolsManagerDelegate::GetFrontendResource(
+    const std::string& path) {
+  return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
+}
+
 }  // namespace content