DevTools: remove DevToolsTargetDescriptor and its implementations, we are now based on devtools age…

components/devtools_discovery/devtools_discovery_manager.cc

Index: components/devtools_discovery/devtools_discovery_manager.cc
diff --git a/components/devtools_discovery/devtools_discovery_manager.cc b/components/devtools_discovery/devtools_discovery_manager.cc
index d7900cd390be30e59eeda9683e798a70e95a1987..eb2c5960ea1334f499e929174136fc1a27c0c4db 100644
--- a/components/devtools_discovery/devtools_discovery_manager.cc
+++ b/components/devtools_discovery/devtools_discovery_manager.cc
@@ -5,8 +5,6 @@
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 
 #include "base/stl_util.h"
-#include "components/devtools_discovery/basic_target_descriptor.h"
-#include "content/public/browser/devtools_agent_host.h"
 
 using content::DevToolsAgentHost;
 
@@ -28,16 +26,11 @@ void DevToolsDiscoveryManager::AddProvider(std::unique_ptr<Provider> provider) {
   providers_.push_back(provider.release());
 }
 
-DevToolsTargetDescriptor::List DevToolsDiscoveryManager::GetDescriptors() {
+content::DevToolsAgentHost::List DevToolsDiscoveryManager::GetDescriptors() {
   if (providers_.size())
     return GetDescriptorsFromProviders();
 
-  DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll();
-  DevToolsTargetDescriptor::List result;
-  result.reserve(agent_hosts.size());
-  for (const auto& agent_host : agent_hosts)
-    result.push_back(new BasicTargetDescriptor(agent_host));
-  return result;
+  return DevToolsAgentHost::GetOrCreateAll();
 }
 
 void DevToolsDiscoveryManager::SetCreateCallback(
@@ -45,18 +38,18 @@ void DevToolsDiscoveryManager::SetCreateCallback(
   create_callback_ = callback;
 }
 
-std::unique_ptr<DevToolsTargetDescriptor> DevToolsDiscoveryManager::CreateNew(
+scoped_refptr<content::DevToolsAgentHost> DevToolsDiscoveryManager::CreateNew(
     const GURL& url) {
   if (create_callback_.is_null())
     return nullptr;
   return create_callback_.Run(url);
 }
 
-DevToolsTargetDescriptor::List
+content::DevToolsAgentHost::List
 DevToolsDiscoveryManager::GetDescriptorsFromProviders() {
-  DevToolsTargetDescriptor::List result;
+  content::DevToolsAgentHost::List result;
   for (auto* provider : providers_) {
-    DevToolsTargetDescriptor::List partial = provider->GetDescriptors();
+    content::DevToolsAgentHost::List partial = provider->GetDescriptors();
     result.insert(result.begin(), partial.begin(), partial.end());
   }
   return result;
@@ -74,15 +67,14 @@ DevToolsDiscoveryManager::HandleCreateTargetCommand(
       method == "Browser.createTarget" &&
       command_dict->GetDictionary("params", &params_dict) &&
       params_dict->GetString("url", &url)) {
-    std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor> descriptor =
-        CreateNew(GURL(url));
-    if (!descriptor)
+    scoped_refptr<content::DevToolsAgentHost> host = CreateNew(GURL(url));
+    if (!host)
       return nullptr;
     std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
     result->SetInteger("id", id);
     std::unique_ptr<base::DictionaryValue> cmd_result(
         new base::DictionaryValue());
-    cmd_result->SetString("targetId", descriptor->GetAgentHost()->GetId());
+    cmd_result->SetString("targetId", host->GetId());
     result->Set("result", std::move(cmd_result));
     return result;
   }