summaryrefslogtreecommitdiffstats
path: root/device/usb/usb.gyp
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2014-09-12 22:37:18 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-13 05:38:58 +0000
commit2191196d13b2896f5ba7bc1c6a3371cb86a7e8eb (patch)
tree199ea1a33cdf1f5078ef37c54c43da266224c3ea /device/usb/usb.gyp
parent9cc636333cf526081f64a315343e9c3b7f396695 (diff)
downloadchromium_src-2191196d13b2896f5ba7bc1c6a3371cb86a7e8eb.zip
chromium_src-2191196d13b2896f5ba7bc1c6a3371cb86a7e8eb.tar.gz
chromium_src-2191196d13b2896f5ba7bc1c6a3371cb86a7e8eb.tar.bz2
Reland: Convert device::UsbConfigDescriptor and friends to structs.
These classes do not need to be classes and expecially don't need to be abstract classes as this leads to a complicated implementation and complicated tests. All USB devices no matter the platform will have the same descriptor data. This change follows the model of device::HidDeviceInfo. Relanding this patch (reverted in crrev.com/294640) after restoring the call to libusb_free_config_descriptor that was removed during refactoring and caused failures in the Linux ASan LSan tests. BUG= Review URL: https://codereview.chromium.org/568943002 Cr-Commit-Position: refs/heads/master@{#294734}
Diffstat (limited to 'device/usb/usb.gyp')
-rw-r--r--device/usb/usb.gyp5
1 files changed, 2 insertions, 3 deletions
diff --git a/device/usb/usb.gyp b/device/usb/usb.gyp
index 81bdf40..f0b5275 100644
--- a/device/usb/usb.gyp
+++ b/device/usb/usb.gyp
@@ -19,6 +19,8 @@
'sources': [
'usb_context.cc',
'usb_context.h',
+ 'usb_descriptors.cc',
+ 'usb_descriptors.h',
'usb_device_impl.cc',
'usb_device_impl.h',
'usb_device.h',
@@ -31,9 +33,6 @@
'usb_error.h',
'usb_ids.cc',
'usb_ids.h',
- 'usb_interface.h',
- 'usb_interface_impl.cc',
- 'usb_interface_impl.h',
'usb_service.h',
'usb_service_impl.cc',
],