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

chrome/browser/android/dev_tools_discovery_provider_android.cc

Index: chrome/browser/android/dev_tools_discovery_provider_android.cc
diff --git a/chrome/browser/android/dev_tools_discovery_provider_android.cc b/chrome/browser/android/dev_tools_discovery_provider_android.cc
index 295097d854cf5d00d1447b51c3f71b8d8f4f5a8d..834c233200ddee4dc65de5545e7408e11ef5d363 100644
--- a/chrome/browser/android/dev_tools_discovery_provider_android.cc
+++ b/chrome/browser/android/dev_tools_discovery_provider_android.cc
@@ -26,7 +26,6 @@
 
 using content::DevToolsAgentHost;
 using content::WebContents;
-using devtools_discovery::DevToolsTargetDescriptor;
 
 namespace {
 
@@ -158,27 +157,24 @@ class TabProxyDelegate : public content::DevToolsExternalAgentProxyDelegate,
   DISALLOW_COPY_AND_ASSIGN(TabProxyDelegate);
 };
 
-std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>
-CreateNewAndroidTab(const GURL& url) {
+scoped_refptr<content::DevToolsAgentHost> CreateNewAndroidTab(const GURL& url) {
   if (TabModelList::empty())
-    return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();
+    return nullptr;
 
   TabModel* tab_model = TabModelList::get(0);
   if (!tab_model)
-    return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();
+    return nullptr;
 
   WebContents* web_contents = tab_model->CreateNewTabForDevTools(url);
   if (!web_contents)
-    return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();
+    return nullptr;
 
   TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
   if (!tab)
-    return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();
+    return nullptr;
 
-  scoped_refptr<content::DevToolsAgentHost> host =
-      content::DevToolsAgentHost::Create(new TabProxyDelegate(
+  return content::DevToolsAgentHost::Create(new TabProxyDelegate(
            tab->GetAndroidId(), tab->GetTitle(), tab->GetURL()));
-  return base::WrapUnique(new devtools_discovery::BasicTargetDescriptor(host));
 }
 
 }  // namespace
@@ -189,9 +185,9 @@ DevToolsDiscoveryProviderAndroid::DevToolsDiscoveryProviderAndroid() {
 DevToolsDiscoveryProviderAndroid::~DevToolsDiscoveryProviderAndroid() {
 }
 
-devtools_discovery::DevToolsTargetDescriptor::List
+content::DevToolsAgentHost::List
 DevToolsDiscoveryProviderAndroid::GetDescriptors() {
-  devtools_discovery::DevToolsTargetDescriptor::List result;
+  content::DevToolsAgentHost::List result;
 
   // Enumerate existing tabs, including the ones with no WebContents.
   std::set<WebContents*> tab_web_contents;
@@ -206,13 +202,13 @@ DevToolsDiscoveryProviderAndroid::GetDescriptors() {
       WebContents* web_contents = tab->web_contents();
       if (web_contents) {
         tab_web_contents.insert(web_contents);
-        result.push_back(new devtools_discovery::BasicTargetDescriptor(
-            content::DevToolsAgentHost::GetOrCreateFor(web_contents)));
+        result.push_back(
+            content::DevToolsAgentHost::GetOrCreateFor(web_contents));
       } else {
         scoped_refptr<content::DevToolsAgentHost> host =
             content::DevToolsAgentHost::Create(new TabProxyDelegate(
                 tab->GetAndroidId(), tab->GetTitle(), tab->GetURL()));
-        result.push_back(new devtools_discovery::BasicTargetDescriptor(host));
+        result.push_back(host);
       }
     }
   }
@@ -225,7 +221,7 @@ DevToolsDiscoveryProviderAndroid::GetDescriptors() {
       if (tab_web_contents.find(web_contents) != tab_web_contents.end())
         continue;
     }
-    result.push_back(new devtools_discovery::BasicTargetDescriptor(*it));
+    result.push_back(*it);
   }
 
   return result;