Construct USB descriptors over explicit values.

device/usb/mojo/device_impl_unittest.cc

 // Copyright 2015 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/mojo/device_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 19 matching lines @@
 using ::testing::Invoke;
 using ::testing::_;
 
 namespace device {
 namespace usb {
 
 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;
   }
 
   const UsbConfigDescriptor& config() const { return config_; }
 
  private:
   UsbConfigDescriptor config_;
 };
 
 void ExpectOpenAndThen(OpenDeviceError expected,
@@ skipping 148 matching lines @@
     return proxy;
   }
 
   DevicePtr GetMockDeviceProxy() {
     return GetMockDeviceProxy(0x1234, 0x5678, "ACME", "Frobinator", "ABCDEF");
   }
 
   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) {
     mock_inbound_data_.push(data);
   }
 
   void AddMockInboundPackets(
       const std::vector<uint8_t>& data,
       const std::vector<UsbDeviceHandle::IsochronousPacket>& packets) {
     mock_inbound_data_.push(data);
@@ skipping 653 matching lines @@
         base::Bind(&ExpectPacketsInAndThen, fake_inbound_data,
                    expected_transferred_lengths, loop.QuitClosure()));
     loop.Run();
   }
 
   EXPECT_CALL(mock_handle(), Close());
 }
 
 }  // namespace usb
 }  // namespace device