Merge 219772 "Adb failed to find devices that debugging interfac..."

> Adb failed to find devices that debugging interface is not interface 1.
> 
BUG=281254
> 
> Review URL: https://chromiumcodereview.appspot.com/23467005

TBR=ikarienator@chromium.org

Review URL: https://codereview.chromium.org/23531012

git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@220533 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/devtools/adb/android_usb_device.cc b/chrome/browser/devtools/adb/android_usb_device.cc
index 82af86a..52de916 100644
--- a/chrome/browser/devtools/adb/android_usb_device.cc
+++ b/chrome/browser/devtools/adb/android_usb_device.cc
@@ -48,7 +48,8 @@ base::LazyInstance<AndroidUsbDevices>::Leaky g_devices =
 static scoped_refptr<AndroidUsbDevice> ClaimInterface(
     crypto::RSAPrivateKey* rsa_key,
     scoped_refptr<UsbDeviceHandle> usb_device,
-    const UsbInterface* interface) {
+    const UsbInterface* interface,
+    int interface_id) {
   if (interface->GetNumAltSettings() == 0)
     return NULL;
 
@@ -81,7 +82,7 @@ static scoped_refptr<AndroidUsbDevice> ClaimInterface(
   if (inbound_address == 0 || outbound_address == 0)
     return NULL;
 
-  if (!usb_device->ClaimInterface(1))
+  if (!usb_device->ClaimInterface(interface_id))
     return NULL;
 
   base::string16 serial;
@@ -193,7 +194,7 @@ static void EnumerateOnFileThread(crypto::RSAPrivateKey* rsa_key,
 
     for (size_t j = 0; j < config->GetNumInterfaces(); ++j) {
       scoped_refptr<AndroidUsbDevice> device =
-          ClaimInterface(rsa_key, usb_device, config->GetInterface(j));
+          ClaimInterface(rsa_key, usb_device, config->GetInterface(j), j);
       if (device.get())
         devices.push_back(device);
     }