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}

1 files changed, 2 insertions, 9 deletions

diff --git a/device/usb/usb_device_filter_unittest.cc b/device/usb/usb_device_filter_unittest.cc
index 303ffa7..df1a223 100644
--- a/device/usb/usb_device_filter_unittest.cc
+++ b/device/usb/usb_device_filter_unittest.cc
@@ -20,15 +20,8 @@ using testing::Return;
 class UsbFilterTest : public testing::Test {
  public:
   void SetUp() override {
-    UsbInterfaceDescriptor interface;
-    interface.interface_number = 1;
-    interface.alternate_setting = 0;
-    interface.interface_class = 0xFF;
-    interface.interface_subclass = 0x42;
-    interface.interface_protocol = 0x01;
-
-    UsbConfigDescriptor config;
-    config.interfaces.push_back(interface);
+    UsbConfigDescriptor config(1, false, false, 0);
+    config.interfaces.emplace_back(1, 0, 0xff, 0x42, 0x01);
 
     android_phone_ = new MockUsbDevice(0x18d1, 0x4ee2, config);
   }