[DevTools] Split device discovery off DevToolsAnrdoidBridge.

chrome/browser/devtools/chrome_devtools_manager_delegate.cc

 // Copyright 2014 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/chrome_devtools_manager_delegate.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/devtools/device/android_device_manager.h"
@@ skipping 35 matching lines @@
 ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() {
 }
 
 void ChromeDevToolsManagerDelegate::Inspect(
     content::DevToolsAgentHost* agent_host) {
   DevToolsWindow::OpenDevToolsWindow(agent_host, nullptr);
 }
 
 void ChromeDevToolsManagerDelegate::DevicesAvailable(
     const DevToolsAgentHost::DiscoveryCallback& callback,
-    const DevToolsAndroidBridge::CompleteDevices& devices) {
+    const DevToolsDeviceDiscovery::CompleteDevices& devices) {
   DevToolsAgentHost::List result = DevToolsAgentHost::GetOrCreateAll();
   for (const auto& complete : devices) {
     for (const auto& browser : complete.second->browsers()) {
       for (const auto& page : browser->pages())
         result.push_back(page->CreateTarget());
     }
   }
   callback.Run(std::move(result));
 }
 
 bool ChromeDevToolsManagerDelegate::DiscoverTargets(
     const DevToolsAgentHost::DiscoveryCallback& callback) {
   if (!tcp_locations_.size())
     return false;
 
   if (!device_manager_)
     device_manager_ = AndroidDeviceManager::Create();
 
   AndroidDeviceManager::DeviceProviders providers;
   providers.push_back(new TCPDeviceProvider(tcp_locations_));
   device_manager_->SetDeviceProviders(providers);
 
-  DevToolsAndroidBridge::QueryCompleteDevices(
+  DevToolsDeviceDiscovery::DiscoverOnce(
       device_manager_.get(),
       base::Bind(&ChromeDevToolsManagerDelegate::DevicesAvailable,
                  base::Unretained(this),
                  callback));
   return true;
 }
 
 base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand(
     DevToolsAgentHost* agent_host,
     base::DictionaryValue* command_dict) {
@@ skipping 131 matching lines @@
     if (!dictionary->GetIntegerWithoutPathExpansion(kPortParam, &port)) {
       return DevToolsProtocol::CreateInvalidParamsResponse(command_id,
                                                            kLocationsParam);
     }
     tcp_locations_.insert(net::HostPortPair(host, port));
   }
   std::unique_ptr<base::DictionaryValue> result(
       base::MakeUnique<base::DictionaryValue>());
   return DevToolsProtocol::CreateSuccessResponse(command_id, std::move(result));
 }