[DevTools] Cleanup DevToolsTarget and DevToolsManagerDelegate after moving to devtools_discovery.

BUG=476496
TBR=jochen

Review URL: https://codereview.chromium.org/1114503002

Cr-Commit-Position: refs/heads/master@{#327300}

11 files changed, 36 insertions, 182 deletions

diff --git a/chrome/browser/android/dev_tools_discovery_provider_android.cc b/chrome/browser/android/dev_tools_discovery_provider_android.cc
index e1a481f..aea64f6 100644
--- a/chrome/browser/android/dev_tools_discovery_provider_android.cc
+++ b/chrome/browser/android/dev_tools_discovery_provider_android.cc
@@ -16,7 +16,6 @@
 #include "components/devtools_discovery/basic_target_descriptor.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_target.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/android/dev_tools_manager_delegate_android.cc b/chrome/browser/android/dev_tools_manager_delegate_android.cc
deleted file mode 100644
index 19845c40..0000000
--- a/chrome/browser/android/dev_tools_manager_delegate_android.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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 "chrome/browser/android/dev_tools_manager_delegate_android.h"
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "chrome/browser/history/top_sites_factory.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "components/devtools_discovery/devtools_discovery_manager.h"
-#include "components/history/core/browser/top_sites.h"
-#include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_target.h"
-
-using content::DevToolsAgentHost;
-
-DevToolsManagerDelegateAndroid::DevToolsManagerDelegateAndroid()
-    : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
-}
-
-DevToolsManagerDelegateAndroid::~DevToolsManagerDelegateAndroid() {
-}
-
-void DevToolsManagerDelegateAndroid::Inspect(
-    content::BrowserContext* browser_context,
-    content::DevToolsAgentHost* agent_host) {
-}
-
-base::DictionaryValue* DevToolsManagerDelegateAndroid::HandleCommand(
-    content::DevToolsAgentHost* agent_host,
-    base::DictionaryValue* command_dict) {
-  return network_protocol_handler_->HandleCommand(agent_host, command_dict);
-}
-
-void DevToolsManagerDelegateAndroid::DevToolsAgentStateChanged(
-    content::DevToolsAgentHost* agent_host,
-    bool attached) {
-  network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
-}
-
-scoped_ptr<content::DevToolsTarget>
-    DevToolsManagerDelegateAndroid::CreateNewTarget(const GURL& url) {
-  devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
-      devtools_discovery::DevToolsDiscoveryManager::GetInstance();
-  return discovery_manager->CreateNew(url);
-}
-
-void DevToolsManagerDelegateAndroid::EnumerateTargets(TargetCallback callback) {
-  TargetList targets;
-  devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
-      devtools_discovery::DevToolsDiscoveryManager::GetInstance();
-  for (const auto& descriptor : discovery_manager->GetDescriptors())
-    targets.push_back(descriptor);
-  callback.Run(targets);
-}
-
-std::string DevToolsManagerDelegateAndroid::GetPageThumbnailData(
-    const GURL& url) {
-  Profile* profile = ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
-  scoped_refptr<history::TopSites> top_sites =
-      TopSitesFactory::GetForProfile(profile);
-  if (top_sites) {
-    scoped_refptr<base::RefCountedMemory> data;
-    if (top_sites->GetPageThumbnail(url, false, &data))
-      return std::string(data->front_as<char>(), data->size());
-  }
-  return std::string();
-}
diff --git a/chrome/browser/android/dev_tools_manager_delegate_android.h b/chrome/browser/android/dev_tools_manager_delegate_android.h
deleted file mode 100644
index 1fa2190..0000000
--- a/chrome/browser/android/dev_tools_manager_delegate_android.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_ANDROID_DEV_TOOLS_MANAGER_DELEGATE_ANDROID_H_
-#define CHROME_BROWSER_ANDROID_DEV_TOOLS_MANAGER_DELEGATE_ANDROID_H_
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/devtools/devtools_network_protocol_handler.h"
-#include "content/public/browser/devtools_manager_delegate.h"
-
-// TODO(dgozman): remove this class once transition to devtools_discovery is
-// completed.
-class DevToolsManagerDelegateAndroid : public content::DevToolsManagerDelegate {
- public:
-  DevToolsManagerDelegateAndroid();
-  ~DevToolsManagerDelegateAndroid() override;
-
-  // content::DevToolsManagerDelegate implementation.
-  void Inspect(content::BrowserContext* browser_context,
-               content::DevToolsAgentHost* agent_host) override;
-  void DevToolsAgentStateChanged(content::DevToolsAgentHost* agent_host,
-                                 bool attached) override;
-  base::DictionaryValue* HandleCommand(
-      content::DevToolsAgentHost* agent_host,
-      base::DictionaryValue* command_dict) override;
-  scoped_ptr<content::DevToolsTarget> CreateNewTarget(const GURL& url) override;
-  void EnumerateTargets(TargetCallback callback) override;
-  std::string GetPageThumbnailData(const GURL& url) override;
-
- private:
-  scoped_ptr<DevToolsNetworkProtocolHandler> network_protocol_handler_;
-
-  DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegateAndroid);
-};
-
-#endif  // CHROME_BROWSER_ANDROID_DEV_TOOLS_MANAGER_DELEGATE_ANDROID_H_
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index 9a91c6b..e42b25f 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -18,7 +18,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/android/dev_tools_manager_delegate_android.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/top_sites_factory.h"
@@ -33,7 +32,6 @@
 #include "content/public/browser/android/devtools_auth.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_target.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
@@ -106,6 +104,19 @@ class DevToolsServerDelegate :
     return std::string();
   }
 
+  std::string GetPageThumbnailData(const GURL& url) override {
+    Profile* profile =
+        ProfileManager::GetLastUsedProfile()->GetOriginalProfile();
+    scoped_refptr<history::TopSites> top_sites =
+        TopSitesFactory::GetForProfile(profile);
+    if (top_sites) {
+      scoped_refptr<base::RefCountedMemory> data;
+      if (top_sites->GetPageThumbnail(url, false, &data))
+        return std::string(data->front_as<char>(), data->size());
+    }
+    return std::string();
+  }
+
  private:
   static void PopulatePageThumbnails() {
     Profile* profile =
@@ -195,7 +206,6 @@ void DevToolsServer::Start(bool allow_debug_permission) {
       allow_debug_permission ?
           base::Bind(&AuthorizeSocketAccessWithDebugPermission) :
           base::Bind(&content::CanUserConnectToDevTools);
-  manager_delegate_.reset(new DevToolsManagerDelegateAndroid());
   chrome::VersionInfo version_info;
 
   scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
@@ -204,7 +214,6 @@ void DevToolsServer::Start(bool allow_debug_permission) {
       factory.Pass(),
       base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
       new DevToolsServerDelegate(),
-      manager_delegate_.get(),
       base::FilePath(),
       base::FilePath(),
       version_info.ProductNameAndVersionForUserAgent(),
@@ -213,7 +222,6 @@ void DevToolsServer::Start(bool allow_debug_permission) {
 
 void DevToolsServer::Stop() {
   devtools_http_handler_.reset();
-  manager_delegate_.reset();
 }
 
 bool DevToolsServer::IsStarted() const {
diff --git a/chrome/browser/android/dev_tools_server.h b/chrome/browser/android/dev_tools_server.h
index 2716ef3..1ada47d 100644
--- a/chrome/browser/android/dev_tools_server.h
+++ b/chrome/browser/android/dev_tools_server.h
@@ -14,8 +14,6 @@ namespace devtools_http_handler {
 class DevToolsHttpHandler;
 }
 
-class DevToolsManagerDelegateAndroid;
-
 // This class controls Developer Tools remote debugging server.
 class DevToolsServer {
  public:
@@ -32,8 +30,6 @@ class DevToolsServer {
 
  private:
   std::string socket_name_;
-  // TODO(dgozman): remove once devtools_discovery component is extracted.
-  scoped_ptr<DevToolsManagerDelegateAndroid> manager_delegate_;
   scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsServer);
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f1cb6e4..b2cb439 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/font_family_cache.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
@@ -175,12 +176,6 @@
 #include "ui/gfx/android/device_display_info.h"
 #endif
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/dev_tools_manager_delegate_android.h"
-#else
-#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
-#endif
-
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 #endif
@@ -2367,11 +2362,7 @@ void ChromeContentBrowserClient::RecordURLMetric(const std::string& metric,
 
 content::DevToolsManagerDelegate*
 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
-#if defined(OS_ANDROID)
-  return new DevToolsManagerDelegateAndroid();
-#else
   return new ChromeDevToolsManagerDelegate();
-#endif
 }
 
 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
diff --git a/chrome/browser/devtools/BUILD.gn b/chrome/browser/devtools/BUILD.gn
index 9dc9e9fe..599f71e 100644
--- a/chrome/browser/devtools/BUILD.gn
+++ b/chrome/browser/devtools/BUILD.gn
@@ -30,6 +30,8 @@ action("devtools_protocol_constants") {
 static_library("devtools") {
   # Note: new sources and deps should be generally added in (!is_android) below.
   sources = [
+    "chrome_devtools_manager_delegate.cc",
+    "chrome_devtools_manager_delegate.h",
     "devtools_network_conditions.cc",
     "devtools_network_conditions.h",
     "devtools_network_controller.cc",
@@ -79,8 +81,6 @@ static_library("devtools") {
     sources += [
       "chrome_devtools_discovery_provider.cc",
       "chrome_devtools_discovery_provider.h",
-      "chrome_devtools_manager_delegate.cc",
-      "chrome_devtools_manager_delegate.h",
       "device/adb/adb_client_socket.cc",
       "device/adb/adb_client_socket.h",
       "device/adb/adb_device_provider.cc",
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index f115a39..8a655ce 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -4,19 +4,11 @@
 
 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 
-#include "base/values.h"
-#include "chrome/browser/devtools/devtools_target_impl.h"
+#if !defined(OS_ANDROID)
 #include "chrome/browser/devtools/devtools_window.h"
-#include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_iterator.h"
-#include "components/devtools_discovery/devtools_discovery_manager.h"
-#include "components/history/core/browser/top_sites.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/web_contents.h"
+#endif  // !defined(OS_ANDROID)
 
 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
     : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
@@ -28,6 +20,7 @@ ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() {
 void ChromeDevToolsManagerDelegate::Inspect(
     content::BrowserContext* browser_context,
     content::DevToolsAgentHost* agent_host) {
+#if !defined(OS_ANDROID)
   content::DevToolsAgentHost::Type type = agent_host->GetType();
   if (type != content::DevToolsAgentHost::TYPE_SHARED_WORKER &&
       type != content::DevToolsAgentHost::TYPE_SERVICE_WORKER) {
@@ -36,6 +29,7 @@ void ChromeDevToolsManagerDelegate::Inspect(
   }
   if (Profile* profile = Profile::FromBrowserContext(browser_context))
     DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host);
+#endif  // !defined(OS_ANDROID)
 }
 
 base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand(
@@ -49,34 +43,3 @@ void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged(
     bool attached) {
   network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
 }
-
-std::string ChromeDevToolsManagerDelegate::GetPageThumbnailData(
-    const GURL& url) {
-  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
-    Profile* profile = (*it)->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();
-}
-
-scoped_ptr<content::DevToolsTarget>
-ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
-  return devtools_discovery::DevToolsDiscoveryManager::GetInstance()->
-      CreateNew(url);
-}
-
-void ChromeDevToolsManagerDelegate::EnumerateTargets(TargetCallback callback) {
-  TargetList targets;
-  devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
-      devtools_discovery::DevToolsDiscoveryManager::GetInstance();
-  for (const auto& descriptor : discovery_manager->GetDescriptors())
-    targets.push_back(descriptor);
-  callback.Run(targets);
-}
-
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.h b/chrome/browser/devtools/chrome_devtools_manager_delegate.h
index 693e9b4..03b3e11 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.h
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.h
@@ -24,9 +24,6 @@ class ChromeDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
   base::DictionaryValue* HandleCommand(
       content::DevToolsAgentHost* agent_host,
       base::DictionaryValue* command_dict) override;
-  scoped_ptr<content::DevToolsTarget> CreateNewTarget(const GURL& url) override;
-  void EnumerateTargets(TargetCallback callback) override;
-  std::string GetPageThumbnailData(const GURL& url) override;
 
  private:
   scoped_ptr<DevToolsNetworkProtocolHandler> network_protocol_handler_;
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index 4fe1064..a94543e 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -7,7 +7,6 @@
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
-#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -85,6 +84,7 @@ class ChromeDevToolsHttpHandlerDelegate
   // devtools_http_handler::DevToolsHttpHandlerDelegate implementation.
   std::string GetDiscoveryPageHTML() override;
   std::string GetFrontendResource(const std::string& path) override;
+  std::string GetPageThumbnailData(const GURL& url) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeDevToolsHttpHandlerDelegate);
@@ -119,6 +119,21 @@ std::string ChromeDevToolsHttpHandlerDelegate::GetFrontendResource(
   return content::DevToolsFrontendHost::GetFrontendResource(path).as_string();
 }
 
+std::string ChromeDevToolsHttpHandlerDelegate::GetPageThumbnailData(
+    const GURL& url) {
+  for (chrome::BrowserIterator it; !it.done(); it.Next()) {
+    Profile* profile = (*it)->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();
+}
+
 }  // namespace
 
 // static
@@ -139,8 +154,6 @@ RemoteDebuggingServer::RemoteDebuggingServer(
     DCHECK(result);
   }
 
-  manager_delegate_.reset(new ChromeDevToolsManagerDelegate());
-
   base::FilePath debug_frontend_dir;
 #if defined(DEBUG_DEVTOOLS)
   PathService::Get(chrome::DIR_INSPECTOR, &debug_frontend_dir);
@@ -152,7 +165,6 @@ RemoteDebuggingServer::RemoteDebuggingServer(
       make_scoped_ptr(new TCPServerSocketFactory(ip, port)),
       std::string(),
       new ChromeDevToolsHttpHandlerDelegate(),
-      manager_delegate_.get(),
       output_dir,
       debug_frontend_dir,
       version_info.ProductNameAndVersionForUserAgent(),
diff --git a/chrome/browser/devtools/remote_debugging_server.h b/chrome/browser/devtools/remote_debugging_server.h
index c82565f..a1169f0 100644
--- a/chrome/browser/devtools/remote_debugging_server.h
+++ b/chrome/browser/devtools/remote_debugging_server.h
@@ -15,8 +15,6 @@ namespace devtools_http_handler {
 class DevToolsHttpHandler;
 }
 
-class ChromeDevToolsManagerDelegate;
-
 class RemoteDebuggingServer {
  public:
   static void EnableTetheringForDebug();
@@ -28,8 +26,6 @@ class RemoteDebuggingServer {
   virtual ~RemoteDebuggingServer();
 
  private:
-  // TODO(dgozman): remove once devtools_discovery component is extracted.
-  scoped_ptr<ChromeDevToolsManagerDelegate> manager_delegate_;
   scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
   DISALLOW_COPY_AND_ASSIGN(RemoteDebuggingServer);
 };