Move string descriptor getters from UsbDeviceHandle to UsbDevice.

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>
 
@@ skipping 22 matching lines @@
 // UsbDeviceHandle class provides basic I/O related functionalities.
 class UsbDeviceHandleImpl : public UsbDeviceHandle {
  public:
   virtual scoped_refptr<UsbDevice> GetDevice() const OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual bool ClaimInterface(int interface_number) OVERRIDE;
   virtual bool ReleaseInterface(int interface_number) OVERRIDE;
   virtual bool SetInterfaceAlternateSetting(int interface_number,
                                             int alternate_setting) OVERRIDE;
   virtual bool ResetDevice() OVERRIDE;
-  virtual bool GetManufacturer(base::string16* manufacturer) OVERRIDE;
-  virtual bool GetProduct(base::string16* product) OVERRIDE;
-  virtual bool GetSerial(base::string16* serial) OVERRIDE;
+  virtual bool GetStringDescriptor(uint8 string_id,
+                                   base::string16* string) OVERRIDE;
+
   virtual void ControlTransfer(UsbEndpointDirection direction,
                                TransferRequestType request_type,
                                TransferRecipient recipient,
                                uint8 request,
                                uint16 value,
                                uint16 index,
                                net::IOBuffer* buffer,
                                size_t length,
                                unsigned int timeout,
                                const UsbTransferCallback& callback) OVERRIDE;
@@ skipping 69 matching lines @@
                       const UsbTransferCallback& callback);
 
   static void LIBUSB_CALL
       PlatformTransferCallback(PlatformUsbTransferHandle handle);
 
   // Invokes the callbacks associated with a given transfer, and removes it from
   // the in-flight transfer set.
   void CompleteTransfer(PlatformUsbTransferHandle transfer);
 
   bool GetSupportedLanguages();
-  bool GetStringDescriptor(uint8 string_id, base::string16* string);
 
   // Informs the object to drop internal references.
   void InternalClose();
 
   UsbDeviceImpl* device_;
 
   PlatformUsbDeviceHandle handle_;
 
   const UsbConfigDescriptor& config_;
 
@@ skipping 17 matching lines @@
   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_