Introduced AndroidDeviceProvider to simplify testing.

chrome/browser/ui/webui/inspect_ui.cc

 // Copyright (c) 2012 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/ui/webui/inspect_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 764 matching lines @@
   const Value* value = GetPrefValue(prefs::kDevToolsDiscoverUsbDevicesEnabled);
   web_ui()->CallJavascriptFunction("updateDiscoverUsbDevicesEnabled", *value);
 
   // Configure adb bridge.
   Profile* profile = Profile::FromWebUI(web_ui());
   DevToolsAdbBridge* adb_bridge =
       DevToolsAdbBridge::Factory::GetForProfile(profile);
   if (adb_bridge) {
     bool enabled = false;
     value->GetAsBoolean(&enabled);
-    adb_bridge->set_discover_usb_devices(enabled);
+
+    DevToolsAdbBridge::DeviceProviders device_providers;
+    device_providers.push_back(AndroidDeviceProvider::GetAdbDeviceProvider());
+
+    if (enabled) {
+      device_providers.push_back(
+          AndroidDeviceProvider::GetUsbDeviceProvider(profile));
+    }
+
+    adb_bridge->set_device_providers(device_providers);
   }
 }
 
 void InspectUI::UpdatePortForwardingEnabled() {
   web_ui()->CallJavascriptFunction("updatePortForwardingEnabled",
       *GetPrefValue(prefs::kDevToolsPortForwardingEnabled));
 
 }
 
 void InspectUI::UpdatePortForwardingConfig() {
@@ skipping 31 matching lines @@
   base::DictionaryValue default_config;
   default_config.SetString(
       kPortForwardingDefaultPort, kPortForwardingDefaultLocation);
   prefs->Set(prefs::kDevToolsPortForwardingConfig, default_config);
 }
 
 const base::Value* InspectUI::GetPrefValue(const char* name) {
   Profile* profile = Profile::FromWebUI(web_ui());
   return profile->GetPrefs()->FindPreference(name)->GetValue();
 }