DevTools: prefer tab-based ids when reporting disovered targets on android.

chrome/browser/android/devtools_manager_delegate_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/devtools_manager_delegate_android.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 36 matching lines @@
   }
 
   void AgentHostClosed(DevToolsAgentHost* agent_host,
                        bool replaced_with_another_client) override {
     proxy_->ConnectionClosed();
   }
 
   void Attach(content::DevToolsExternalAgentProxy* proxy) override {
     proxy_ = proxy;
     MaterializeAgentHost();
+    if (agent_host_)
+      agent_host_->AttachClient(this);
   }
 
   void Detach() override {
     if (agent_host_)
       agent_host_->DetachClient(this);
     agent_host_ = nullptr;
     proxy_ = nullptr;
   }
 
   std::string GetType() override {
@@ skipping 96 matching lines @@
   // 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;
 
+      if (tab->web_contents())
+        tab_web_contents.insert(tab->web_contents());
+
       scoped_refptr<DevToolsAgentHost> host =
           DevToolsAgentHost::Forward(
               base::IntToString(tab->GetAndroidId()),
               base::WrapUnique(new TabProxyDelegate(tab)));
+      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;
@@ skipping 68 matching lines @@
 
 std::string DevToolsManagerDelegateAndroid::GetDiscoveryPageHTML() {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
 }
 
 void DevToolsManagerDelegateAndroid::DevToolsAgentStateChanged(
     DevToolsAgentHost* agent_host, bool attached) {
   network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
 }