DevTools: simplify http handler delegate as it is moving into content.

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/history/top_sites_factory.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/history/core/browser/top_sites.h"
 #include "components/version_info/version_info.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;
 
 const uint16_t kMinTetheringPort = 9333;
 const uint16_t kMaxTetheringPort = 9444;
 const int kBackLog = 10;
 
 class TCPServerSocketFactory
-    : public devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory {
+    : public content::DevToolsSocketFactory {
  public:
   TCPServerSocketFactory(const std::string& address, uint16_t port)
       : address_(address),
         port_(port),
         last_tethering_port_(kMinTetheringPort) {}
 
  private:
   std::unique_ptr<net::ServerSocket> CreateLocalHostServerSocket(int port) {
     std::unique_ptr<net::ServerSocket> socket(
         new net::TCPServerSocket(nullptr, net::NetLog::Source()));
     if (socket->ListenWithAddressAndPort(
             "127.0.0.1", port, kBackLog) == net::OK)
       return socket;
     if (socket->ListenWithAddressAndPort("::1", port, kBackLog) == net::OK)
       return socket;
     return std::unique_ptr<net::ServerSocket>();
   }
 
-  // devtools_http_handler::DevToolsHttpHandler::ServerSocketFactory.
+  // content::DevToolsSocketFactory.
   std::unique_ptr<net::ServerSocket> CreateForHttpServer() override {
     std::unique_ptr<net::ServerSocket> socket(
         new net::TCPServerSocket(nullptr, net::NetLog::Source()));
     if (address_.empty())
       return CreateLocalHostServerSocket(port_);
     if (socket->ListenWithAddressAndPort(address_, port_, kBackLog) == net::OK)
       return socket;
     return std::unique_ptr<net::ServerSocket>();
   }
 
@@ skipping 18 matching lines @@
 
 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;
-  std::string GetPageThumbnailData(const GURL& url) override;
-  content::DevToolsExternalAgentProxyDelegate*
-      HandleWebSocketConnection(const std::string& path) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeDevToolsHttpHandlerDelegate);
 };
 
 ChromeDevToolsHttpHandlerDelegate::ChromeDevToolsHttpHandlerDelegate() {
 }
 
 ChromeDevToolsHttpHandlerDelegate::~ChromeDevToolsHttpHandlerDelegate() {
 }
 
 std::string ChromeDevToolsHttpHandlerDelegate::GetDiscoveryPageHTML() {
-  std::set<Profile*> profiles;
-  for (auto* browser : *BrowserList::GetInstance())
-    profiles.insert(browser->profile());
-
-  for (std::set<Profile*>::iterator it = profiles.begin();
-       it != profiles.end(); ++it) {
-    scoped_refptr<history::TopSites> ts = TopSitesFactory::GetForProfile(*it);
-    if (ts) {
-      // TopSites updates itself after a delay. Ask TopSites to update itself
-      // when we're about to show the remote debugging landing page.
-      ts->SyncWithHistory();
-    }
-  }
   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();
 }
 
-std::string ChromeDevToolsHttpHandlerDelegate::GetPageThumbnailData(
-    const GURL& url) {
-  for (auto* browser : *BrowserList::GetInstance()) {
-    Profile* profile = browser->profile();
-    scoped_refptr<history::TopSites> top_sites =
-        TopSitesFactory::GetForProfile(profile);
-    if (!top_sites)
-      continue;
-    scoped_refptr<base::RefCountedMemory> data;
-    if (top_sites->GetPageThumbnail(url, false, &data))
-      return std::string(data->front_as<char>(), data->size());
-  }
-  return std::string();
-}
-
-content::DevToolsExternalAgentProxyDelegate*
-ChromeDevToolsHttpHandlerDelegate::HandleWebSocketConnection(
-    const std::string& path) {
-  return nullptr;
-}
-
 }  // namespace
 
 // static
 void RemoteDebuggingServer::EnableTetheringForDebug() {
   g_tethering_enabled.Get() = true;
 }
 
 RemoteDebuggingServer::RemoteDebuggingServer(const std::string& ip,
                                              uint16_t port) {
   base::FilePath output_dir;
@@ skipping 14 matching lines @@
       base::WrapUnique(new TCPServerSocketFactory(ip, port)), std::string(),
       new ChromeDevToolsHttpHandlerDelegate(), 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());
 }