Move string descriptor getters from UsbDeviceHandle to UsbDevice.

device/usb/usb_device_handle.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_H_
 #define DEVICE_USB_USB_DEVICE_HANDLE_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 38 matching lines @@
   // The platform device handle will be closed when UsbDeviceHandle destructs.
   virtual void Close() = 0;
 
   // Device manipulation operations. These methods are blocking and must be
   // called on FILE thread.
   virtual bool ClaimInterface(int interface_number) = 0;
   virtual bool ReleaseInterface(int interface_number) = 0;
   virtual bool SetInterfaceAlternateSetting(int interface_number,
                                             int alternate_setting) = 0;
   virtual bool ResetDevice() = 0;
-  virtual bool GetManufacturer(base::string16* manufacturer) = 0;
-  virtual bool GetProduct(base::string16* product) = 0;
-  virtual bool GetSerial(base::string16* serial) = 0;
+
+  // Gets the string descriptor with the given index from the device, or returns
+  // false. This method is blocking and must be called on the FILE thread.
+  virtual bool GetStringDescriptor(uint8 string_id, base::string16* string) = 0;
 
   // Async IO. Can be called on any thread.
   virtual void ControlTransfer(UsbEndpointDirection direction,
                                TransferRequestType request_type,
                                TransferRecipient recipient,
                                uint8 request,
                                uint16 value,
                                uint16 index,
                                net::IOBuffer* buffer,
                                size_t length,
@@ skipping 29 matching lines @@
   UsbDeviceHandle() {};
 
   virtual ~UsbDeviceHandle() {};
 
   DISALLOW_COPY_AND_ASSIGN(UsbDeviceHandle);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_USB_USB_DEVICE_HANDLE_H_