diff options
author | reillyg <reillyg@chromium.org> | 2016-02-11 17:38:38 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 01:39:46 +0000 |
commit | 54128082613544e4fa1fb2f0d6a367dea635c173 (patch) | |
tree | 9f4397351d773cbbbd66fef0ee5911497c64fec5 /device/usb/mojo/device_impl_unittest.cc | |
parent | 0f8742a11a2ac76833ae1dc4dcdaa14086fbcf44 (diff) | |
download | chromium_src-54128082613544e4fa1fb2f0d6a367dea635c173.zip chromium_src-54128082613544e4fa1fb2f0d6a367dea635c173.tar.gz chromium_src-54128082613544e4fa1fb2f0d6a367dea635c173.tar.bz2 |
Construct USB descriptors over explicit values.
Instead of specifying a bunch of arbitrary defaults and then updating
them in the code building the structure. This makes them friendly to use
with C++11's emplace_back() method.
BUG=None
Review URL: https://codereview.chromium.org/1468423003
Cr-Commit-Position: refs/heads/master@{#375081}
Diffstat (limited to 'device/usb/mojo/device_impl_unittest.cc')
-rw-r--r-- | device/usb/mojo/device_impl_unittest.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/device/usb/mojo/device_impl_unittest.cc b/device/usb/mojo/device_impl_unittest.cc index c6c2e49..df23b01 100644 --- a/device/usb/mojo/device_impl_unittest.cc +++ b/device/usb/mojo/device_impl_unittest.cc @@ -37,20 +37,15 @@ namespace { class ConfigBuilder { public: - explicit ConfigBuilder(uint8_t value) { config_.configuration_value = value; } + explicit ConfigBuilder(uint8_t value) : config_(value, false, false, 0) {} ConfigBuilder& AddInterface(uint8_t interface_number, uint8_t alternate_setting, uint8_t class_code, uint8_t subclass_code, uint8_t protocol_code) { - UsbInterfaceDescriptor interface; - interface.interface_number = interface_number; - interface.alternate_setting = alternate_setting; - interface.interface_class = class_code; - interface.interface_subclass = subclass_code; - interface.interface_protocol = protocol_code; - config_.interfaces.push_back(interface); + config_.interfaces.emplace_back(interface_number, alternate_setting, + class_code, subclass_code, protocol_code); return *this; } @@ -219,7 +214,7 @@ class USBDeviceImplTest : public testing::Test { void AddMockConfig(const ConfigBuilder& builder) { const UsbConfigDescriptor& config = builder.config(); DCHECK(!ContainsKey(mock_configs_, config.configuration_value)); - mock_configs_[config.configuration_value] = config; + mock_configs_.insert(std::make_pair(config.configuration_value, config)); } void AddMockInboundData(const std::vector<uint8_t>& data) { |