DevTools: merge devtools target with devtools host, part 1

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 113748bf31d7443d468e4fea29b4f5a122a51ee0..14dec7043f02e9bd8b2427e4c204e89c816ed208 100644
--- a/chrome/browser/android/dev_tools_discovery_provider_android.cc
+++ b/chrome/browser/android/dev_tools_discovery_provider_android.cc
@@ -80,7 +80,7 @@ class TabDescriptor : public devtools_discovery::DevToolsTargetDescriptor {
   }
 
   std::string GetType() const override {
-    return devtools_discovery::BasicTargetDescriptor::kTypePage;
+    return DevToolsAgentHost::kTypePage;
   }
 
   bool IsAttached() const override {
@@ -237,7 +237,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(new DevToolsTargetImpl(*it));
   }
 
   return result;