DevTools: remove devtools_discovery (merged into content).

android_webview/browser/aw_dev_tools_discovery_provider.cc

Index: android_webview/browser/aw_dev_tools_discovery_provider.cc
diff --git a/android_webview/browser/aw_dev_tools_discovery_provider.cc b/android_webview/browser/aw_dev_tools_discovery_provider.cc
index 6e2fb5bb87f7e29307ebff4e906d2162eeb80cfb..d29be3f856cbd4ec5673e92a3beb475e3819830d 100644
--- a/android_webview/browser/aw_dev_tools_discovery_provider.cc
+++ b/android_webview/browser/aw_dev_tools_discovery_provider.cc
@@ -10,7 +10,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ -39,16 +38,22 @@ std::string GetViewDescription(WebContents* web_contents) {
   return json;
 }
 
+content::DevToolsAgentHost::List GetDescriptors() {
+  DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll();
+  for (auto& agent_host : agent_hosts) {
+    agent_host->SetDescriptionOverride(
+        GetViewDescription(agent_host->GetWebContents()));
+  }
+  return agent_hosts;
+}
+
 }  // namespace
 
 namespace android_webview {
 
 // static
 void AwDevToolsDiscoveryProvider::Install() {
-  devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
-      devtools_discovery::DevToolsDiscoveryManager::GetInstance();
-  discovery_manager->AddProvider(
-      base::WrapUnique(new AwDevToolsDiscoveryProvider()));
+  content::DevToolsAgentHost::AddDiscoveryProvider(base::Bind(&GetDescriptors));
 }
 
 AwDevToolsDiscoveryProvider::AwDevToolsDiscoveryProvider() {
@@ -57,14 +62,4 @@ AwDevToolsDiscoveryProvider::AwDevToolsDiscoveryProvider() {
 AwDevToolsDiscoveryProvider::~AwDevToolsDiscoveryProvider() {
 }
 
-content::DevToolsAgentHost::List
-AwDevToolsDiscoveryProvider::GetDescriptors() {
-  DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll();
-  for (auto& agent_host : agent_hosts) {
-    agent_host->SetDescriptionOverride(
-        GetViewDescription(agent_host->GetWebContents()));
-  }
-  return agent_hosts;
-}
-
 }  // namespace android_webview