Match against all configurations in UsbDeviceFilter.

device/usb/usb_device_filter.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 "device/usb/usb_device_filter.h"
 
 #include "base/values.h"
 #include "device/usb/usb_descriptors.h"
 #include "device/usb/usb_device.h"
 
@@ skipping 50 matching lines @@
     if (device->vendor_id() != vendor_id_) {
       return false;
     }
 
     if (product_id_set_ && device->product_id() != product_id_) {
       return false;
     }
   }
 
   if (interface_class_set_) {
-    const UsbConfigDescriptor* config = device->GetActiveConfiguration();
-    if (!config) {
-      return false;
+    bool foundMatch = false;
+    for (const UsbConfigDescriptor& config : device->configurations()) {
+      for (const UsbInterfaceDescriptor& iface : config.interfaces) {
+        if (iface.interface_class == interface_class_ &&
+            (!interface_subclass_set_ ||
+             (iface.interface_subclass == interface_subclass_ &&
+              (!interface_protocol_set_ ||
+               iface.interface_protocol == interface_protocol_)))) {

[Ken Rockot(use gerrit already), 2015/09/15 17:40:09]

I think foundMatch is unnecessary, and you can just return true here.

[Reilly Grant (use Gerrit), 2015/09/15 17:45:54]

Done.

+          foundMatch = true;
+          break;
+        }
+      }
+      if (foundMatch)
+        break;
     }
 
-    // TODO(reillyg): Check device configuration if the class is not defined at
-    // a per-interface level. This is not really important because most devices
-    // have per-interface classes. The only counter-examples I know of are hubs.
-
-    bool foundMatch = false;
-    for (const UsbInterfaceDescriptor& iface : config->interfaces) {
-      if (iface.interface_class == interface_class_ &&
-          (!interface_subclass_set_ ||
-           (iface.interface_subclass == interface_subclass_ &&
-            (!interface_protocol_set_ ||
-             iface.interface_protocol == interface_protocol_)))) {
-        foundMatch = true;
-      }
-    }
-
-    if (!foundMatch) {
+    if (!foundMatch)
       return false;
-    }
   }
 
   return true;
 }
 
 scoped_ptr<base::Value> UsbDeviceFilter::ToValue() const {
   scoped_ptr<base::DictionaryValue> obj(new base::DictionaryValue());
 
   if (vendor_id_set_) {
     obj->SetInteger(kVendorIdKey, vendor_id_);
@@ skipping 22 matching lines @@
        i != filters.end();
        ++i) {
     if (i->Matches(device)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace device