Index: chrome/browser/devtools/device/usb/android_usb_device.cc |
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc |
index 1e0f3af410b0664357ca48a319c01a7a587ea8c8..ad2e2ae03104d2b24e9672ff269b1133fcaa611a 100644 |
--- a/chrome/browser/devtools/device/usb/android_usb_device.cc |
+++ b/chrome/browser/devtools/device/usb/android_usb_device.cc |
@@ -20,7 +20,6 @@ |
#include "content/public/browser/browser_thread.h" |
#include "crypto/rsa_private_key.h" |
#include "device/core/device_client.h" |
-#include "device/usb/usb_descriptors.h" |
#include "device/usb/usb_device.h" |
#include "device/usb/usb_service.h" |
#include "net/base/ip_endpoint.h" |
@@ -74,7 +73,7 @@ void CountAndroidDevices(const base::Callback<void(int)>& callback, |
const UsbDevices& devices) { |
int device_count = 0; |
for (const scoped_refptr<UsbDevice>& device : devices) { |
- const UsbConfigDescriptor* config = device->GetConfiguration(); |
+ const UsbConfigDescriptor* config = device->GetActiveConfiguration(); |
if (config) { |
for (const UsbInterfaceDescriptor& iface : config->interfaces) { |
if (IsAndroidInterface(iface)) { |
@@ -207,7 +206,7 @@ void OpenAndroidDevice(AndroidUsbDevices* devices, |
return; |
} |
- const UsbConfigDescriptor* config = device->GetConfiguration(); |
+ const UsbConfigDescriptor* config = device->GetActiveConfiguration(); |
if (!config) { |
barrier.Run(); |
return; |
@@ -251,7 +250,7 @@ void OpenAndroidDevices( |
base::Bind(&RespondOnUIThread, callback, devices, caller_task_runner)); |
for (const scoped_refptr<UsbDevice>& device : usb_devices) { |
- const UsbConfigDescriptor* config = device->GetConfiguration(); |
+ const UsbConfigDescriptor* config = device->GetActiveConfiguration(); |
if (!config) { |
barrier.Run(); |
continue; |