Revert of Convert device::UsbConfigDescriptor and friends to structs.

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"
+#include "device/usb/usb_interface.h"
 
 namespace device {
 
 namespace {
 
 const char kProductIdKey[] = "productId";
 const char kVendorIdKey[] = "vendorId";
 const char kInterfaceClassKey[] = "interfaceClass";
 const char kInterfaceSubclassKey[] = "interfaceSubclass";
 const char kInterfaceProtocolKey[] = "interfaceProtocol";
@@ skipping 42 matching lines @@
       return false;
     }
 
     if (product_id_set_ && device->product_id() != product_id_) {
       return false;
     }
   }
 
   if (interface_class_set_) {
     bool foundMatch = false;
-    const UsbConfigDescriptor& config = device->GetConfiguration();
+    scoped_refptr<const UsbConfigDescriptor> config = device->ListInterfaces();
 
     // 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.
 
-    for (UsbInterfaceDescriptor::Iterator ifaceIt = config.interfaces.begin();
-         ifaceIt != config.interfaces.end() && !foundMatch;
-         ++ifaceIt) {
-      if (ifaceIt->interface_class == interface_class_ &&
-          (!interface_subclass_set_ ||
-           (ifaceIt->interface_subclass == interface_subclass_ &&
-            (!interface_protocol_set_ ||
-             ifaceIt->interface_protocol == interface_protocol_)))) {
-        foundMatch = true;
+    for (size_t i = 0; i < config->GetNumInterfaces() && !foundMatch; ++i) {
+      scoped_refptr<const UsbInterfaceDescriptor> iface =
+          config->GetInterface(i);
+
+      for (size_t j = 0; j < iface->GetNumAltSettings() && !foundMatch; ++j) {
+        scoped_refptr<const UsbInterfaceAltSettingDescriptor> altSetting =
+            iface->GetAltSetting(j);
+
+        if (altSetting->GetInterfaceClass() == interface_class_ &&
+            (!interface_subclass_set_ ||
+             (altSetting->GetInterfaceSubclass() == interface_subclass_ &&
+              (!interface_protocol_set_ ||
+               altSetting->GetInterfaceProtocol() == interface_protocol_)))) {
+          foundMatch = true;
+        }
       }
     }
 
     if (!foundMatch) {
       return false;
     }
   }
 
   return true;
 }
@@ skipping 28 matching lines @@
        i != filters.end();
        ++i) {
     if (i->Matches(device)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace device