DevTools: merge devtools target with devtools host, part 1

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"
@@ skipping 62 matching lines @@
 
   base::TimeTicks GetLastActivityTime() const override {
     return last_activity_time_;
   }
 
   std::string GetId() const override {
     return base::IntToString(tab_id_);
   }
 
   std::string GetType() const override {
-    return devtools_discovery::BasicTargetDescriptor::kTypePage;
+    return DevToolsAgentHost::kTypePage;
   }
 
   bool IsAttached() const override {
     TabModel* model;
     int index;
     if (!FindTab(&model, &index))
       return false;
     WebContents* web_contents = model->GetWebContentsAt(index);
     if (!web_contents)
       return false;
@@ skipping 122 matching lines @@
       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(TabDescriptor::CreateForWebContents(
             tab->GetAndroidId(), web_contents));
       } else {
         result.push_back(TabDescriptor::CreateForUnloadedTab(

[dgozman, 2016/08/22 23:09:07]

This should be a forwarding agent host.

             tab->GetAndroidId(), tab->GetTitle(), tab->GetURL()));
       }
     }
   }
 
   // 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(new DevToolsTargetImpl(*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));
 }