Convert device::UsbConfigDescriptor and friends to structs.

device/usb/usb_device_handle_impl.h

 // 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.
 
 #ifndef DEVICE_USB_USB_DEVICE_HANDLE_IMPL_H_
 #define DEVICE_USB_USB_DEVICE_HANDLE_IMPL_H_
 
 #include <map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_checker.h"
 #include "device/usb/usb_device_handle.h"
-#include "device/usb/usb_interface.h"
 #include "net/base/io_buffer.h"
 #include "third_party/libusb/src/libusb/libusb.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace device {
 
 class UsbContext;
-class UsbConfigDescriptor;
+struct UsbConfigDescriptor;
 class UsbDeviceImpl;
 
 typedef libusb_device_handle* PlatformUsbDeviceHandle;
 typedef libusb_iso_packet_descriptor* PlatformUsbIsoPacketDescriptor;
 typedef libusb_transfer* PlatformUsbTransferHandle;
 
 // UsbDeviceHandle class provides basic I/O related functionalities.
 class UsbDeviceHandleImpl : public UsbDeviceHandle {
  public:
   virtual scoped_refptr<UsbDevice> GetDevice() const OVERRIDE;
@@ skipping 44 matching lines @@
 
   PlatformUsbDeviceHandle handle() const { return handle_; }
 
  protected:
   friend class UsbDeviceImpl;
 
   // This constructor is called by UsbDevice.
   UsbDeviceHandleImpl(scoped_refptr<UsbContext> context,
                       UsbDeviceImpl* device,
                       PlatformUsbDeviceHandle handle,
-                      scoped_refptr<UsbConfigDescriptor> interfaces);
+                      const UsbConfigDescriptor& config);
 
   virtual ~UsbDeviceHandleImpl();
 
  private:
   class InterfaceClaimer;
   struct Transfer;
 
   // Refresh endpoint_map_ after ClaimInterface, ReleaseInterface and
   // SetInterfaceAlternateSetting.
   void RefreshEndpointMap();
@@ skipping 33 matching lines @@
   bool GetSupportedLanguages();
   bool GetStringDescriptor(uint8 string_id, base::string16* string);
 
   // Informs the object to drop internal references.
   void InternalClose();
 
   UsbDeviceImpl* device_;
 
   PlatformUsbDeviceHandle handle_;
 
-  scoped_refptr<UsbConfigDescriptor> interfaces_;
+  const UsbConfigDescriptor& config_;
 
   std::vector<uint16> languages_;
   std::map<uint8, base::string16> strings_;
 
   typedef std::map<int, scoped_refptr<InterfaceClaimer> > ClaimedInterfaceMap;
   ClaimedInterfaceMap claimed_interfaces_;
 
   typedef std::map<PlatformUsbTransferHandle, Transfer> TransferMap;
   TransferMap transfers_;
 
   // A map from endpoints to interfaces
   typedef std::map<int, int> EndpointMap;
   EndpointMap endpoint_map_;
 
   // Retain the UsbContext so that the platform context will not be destroyed
   // before this handle.
   scoped_refptr<UsbContext> context_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbDeviceHandleImpl);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_USB_USB_DEVICE_HANDLE_IMPL_H_