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

chrome/browser/android/dev_tools_discovery_provider_android.cc

 // Copyright 2015 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_discovery_provider_android.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #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_agent_host_client.h"
 #include "content/public/browser/devtools_external_agent_proxy.h"
 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using content::DevToolsAgentHost;
 using content::WebContents;
-using devtools_discovery::DevToolsTargetDescriptor;
 
 namespace {
 
 class TabProxyDelegate : public content::DevToolsExternalAgentProxyDelegate,
                          public content::DevToolsAgentHostClient {
  public:
   TabProxyDelegate(int tab_id, const base::string16& title, const GURL& url)
       : tab_id_(tab_id),
         title_(base::UTF16ToUTF8(title)),
         url_(url) {
@@ skipping 111 matching lines @@
   }
 
   const int tab_id_;
   const std::string title_;
   const GURL url_;
   scoped_refptr<content::DevToolsAgentHost> agent_host_;
   content::DevToolsExternalAgentProxy* proxy_;
   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
 
 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;
   for (TabModelList::const_iterator iter = TabModelList::begin();
       iter != TabModelList::end(); ++iter) {
     TabModel* model = *iter;
     for (int i = 0; i < model->GetTabCount(); ++i) {
       TabAndroid* tab = model->GetTabAt(i);
       if (!tab)
         continue;
 
       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);
       }
     }
   }
 
   // Add descriptors for targets not associated with any tabs.
   DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
   for (DevToolsAgentHost::List::iterator it = agents.begin();
        it != agents.end(); ++it) {
     if (WebContents* web_contents = (*it)->GetWebContents()) {
       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;
 }
 
 // static
 void DevToolsDiscoveryProviderAndroid::Install() {
   devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
       devtools_discovery::DevToolsDiscoveryManager::GetInstance();
   discovery_manager->AddProvider(
       base::WrapUnique(new DevToolsDiscoveryProviderAndroid()));
   discovery_manager->SetCreateCallback(base::Bind(&CreateNewAndroidTab));
 }