Construct USB descriptors over explicit values.

chrome/browser/devtools/device/usb/android_usb_browsertest.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 <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 382 matching lines @@
 };
 
 template <class T>
 class MockUsbDevice : public UsbDevice {
  public:
   MockUsbDevice()
       : UsbDevice(0,
                   0,
                   base::UTF8ToUTF16(kDeviceManufacturer),
                   base::UTF8ToUTF16(kDeviceModel),
-                  base::UTF8ToUTF16(kDeviceSerial)) {
-    UsbEndpointDescriptor bulk_in;
-    bulk_in.address = 0x81;
-    bulk_in.direction = device::USB_DIRECTION_INBOUND;
-    bulk_in.maximum_packet_size = 512;
-    bulk_in.transfer_type = device::USB_TRANSFER_BULK;
-
-    UsbEndpointDescriptor bulk_out;
-    bulk_out.address = 0x01;
-    bulk_out.direction = device::USB_DIRECTION_OUTBOUND;
-    bulk_out.maximum_packet_size = 512;
-    bulk_out.transfer_type = device::USB_TRANSFER_BULK;
-
-    UsbInterfaceDescriptor interface_desc;
-    interface_desc.interface_number = 0;
-    interface_desc.alternate_setting = 0;
-    interface_desc.interface_class = T::kClass;
-    interface_desc.interface_subclass = T::kSubclass;
-    interface_desc.interface_protocol = T::kProtocol;
-    interface_desc.endpoints.push_back(bulk_in);
-    interface_desc.endpoints.push_back(bulk_out);
-
+                  base::UTF8ToUTF16(kDeviceSerial)),
+        config_desc_(1, false, false, 0) {
+    UsbInterfaceDescriptor interface_desc(0, 0, T::kClass, T::kSubclass,
+                                          T::kProtocol);
+    interface_desc.endpoints.emplace_back(0x81, device::USB_DIRECTION_INBOUND,
+                                          512, device::USB_SYNCHRONIZATION_NONE,
+                                          device::USB_TRANSFER_BULK,
+                                          device::USB_USAGE_DATA, 0);
+    interface_desc.endpoints.emplace_back(0x01, device::USB_DIRECTION_OUTBOUND,
+                                          512, device::USB_SYNCHRONIZATION_NONE,
+                                          device::USB_TRANSFER_BULK,
+                                          device::USB_USAGE_DATA, 0);
     config_desc_.interfaces.push_back(interface_desc);
   }
 
   void Open(const OpenCallback& callback) override {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, make_scoped_refptr(
                                             new MockUsbDeviceHandle<T>(this))));
   }
 
   const UsbConfigDescriptor* GetActiveConfiguration() override {
@@ skipping 368 matching lines @@
   EXPECT_EQ(2, listener.invoked_);
   EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_);
   EXPECT_TRUE(base::MessageLoop::current()->IsIdleForTesting());
 }
 
 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) {
   MockCountListenerForCheckingTraits listener(adb_bridge_);
   adb_bridge_->AddDeviceCountListener(&listener);
   runner_->Run();
 }