DevTools: untangle device discovery request from the devtools android bridge.

chrome/browser/devtools/devtools_targets_ui.cc

 // Copyright 2013 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/devtools/devtools_targets_ui.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 47 matching lines @@
 const char kAdbDeviceIdFormat[] = "device:%s";
 
 const char kAdbBrowserNameField[] = "adbBrowserName";
 const char kAdbBrowserUserField[] = "adbBrowserUser";
 const char kAdbBrowserVersionField[] = "adbBrowserVersion";
 const char kAdbBrowserChromeVersionField[] = "adbBrowserChromeVersion";
 const char kAdbPagesList[] = "pages";
 
 const char kAdbScreenWidthField[] = "adbScreenWidth";
 const char kAdbScreenHeightField[] = "adbScreenHeight";
-const char kAdbAttachedForeignField[]  = "adbAttachedForeign";
 
 const char kPortForwardingPorts[] = "ports";
 const char kPortForwardingBrowserId[] = "browserId";
 
 // CancelableTimer ------------------------------------------------------------
 
 class CancelableTimer {
  public:
   CancelableTimer(base::Closure callback, base::TimeDelta delay)
       : callback_(callback),
@@ skipping 284 matching lines @@
           kAdbBrowserChromeVersionField,
           browser->IsChrome() && !parsed.empty() ? parsed[0] : 0);
       std::string browser_id = browser->GetId();
       browser_data->SetString(kTargetIdField, browser_id);
       browser_data->SetString(kTargetSourceField, source_id());
 
       base::ListValue* page_list = new base::ListValue();
       remote_browsers_[browser_id] = browser;
             browser_data->Set(kAdbPagesList, page_list);
       for (const auto& page : browser->pages()) {
-        scoped_refptr<DevToolsAgentHost> host =
-            android_bridge_->CreatePageTarget(page);
+        scoped_refptr<DevToolsAgentHost> host = page->CreateTarget();
         std::unique_ptr<base::DictionaryValue> target_data = Serialize(host);
-        target_data->SetBoolean(
-            kAdbAttachedForeignField,
-            host->IsAttached() &&
-                !android_bridge_->HasDevToolsWindow(host->GetId()));
         // Pass the screen size in the target object to make sure that
         // the caching logic does not prevent the target item from updating
         // when the screen size changes.
         gfx::Size screen_size = device->screen_size();
         target_data->SetInteger(kAdbScreenWidthField, screen_size.width());
         target_data->SetInteger(kAdbScreenHeightField, screen_size.height());
         targets_[host->GetId()] = host;
         page_list->Append(std::move(target_data));
       }
       browser_list->Append(std::move(browser_data));
@@ skipping 110 matching lines @@
     device_status_dict->SetString(kPortForwardingBrowserId,
                                   sit->first->GetId());
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         sit->first->serial().c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }