Move string descriptor getters from UsbDeviceHandle to UsbDevice.

device/usb/usb_device_handle_impl.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 "device/usb/usb_device_handle_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 391 matching lines @@
     return false;
   } else if ((languages[0] >> 8) != LIBUSB_DT_STRING) {
     VLOG(1) << "String descriptor zero is not a string descriptor.";
     return false;
   }
 
   languages_.assign(languages[1], languages[(size - 2) / 2]);
   return true;
 }
 
 bool UsbDeviceHandleImpl::GetStringDescriptor(uint8 string_id,

[scheib, 2014/09/25 17:36:04]

Move to match declaration order.

[Reilly Grant (use Gerrit), 2014/09/25 17:58:44]

This file is all out of order. It's actually the function above that's in the
wrong place. I'm rewriting this whole thing soon.

[scheib, 2014/09/25 19:47:05]

Fix at least the methods that you move the declarations of, otherwise once any
file is 'out of order' it will never approach order. Or have a one off patch to
fix the file, or promise pinky swear that you'll reorder the file right after
this patch and CC/R me on it. ;)

[Reilly Grant (use Gerrit), 2014/09/25 19:55:15]

Done. I should stop being lazy.

                                               base::string16* string) {
   if (!GetSupportedLanguages()) {
     return false;
   }
 
   std::map<uint8, base::string16>::const_iterator it = strings_.find(string_id);
   if (it != strings_.end()) {
     *string = it->second;
     return true;
   }
@@ skipping 29 matching lines @@
     }
 
     *string = base::string16(text + 1, (size - 2) / 2);
     strings_[string_id] = *string;
     return true;
   }
 
   return false;
 }
 
-bool UsbDeviceHandleImpl::GetManufacturer(base::string16* manufacturer) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  PlatformUsbDevice device = libusb_get_device(handle_);
-  libusb_device_descriptor desc;
-
-  // This is a non-blocking call as libusb has the descriptor in memory.
-  const int rv = libusb_get_device_descriptor(device, &desc);
-  if (rv != LIBUSB_SUCCESS) {
-    VLOG(1) << "Failed to read device descriptor: "
-            << ConvertPlatformUsbErrorToString(rv);
-    return false;
-  }
-
-  if (desc.iManufacturer == 0) {
-    return false;
-  }
-
-  return GetStringDescriptor(desc.iManufacturer, manufacturer);
-}
-
-bool UsbDeviceHandleImpl::GetProduct(base::string16* product) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  PlatformUsbDevice device = libusb_get_device(handle_);
-  libusb_device_descriptor desc;
-
-  // This is a non-blocking call as libusb has the descriptor in memory.
-  const int rv = libusb_get_device_descriptor(device, &desc);
-  if (rv != LIBUSB_SUCCESS) {
-    VLOG(1) << "Failed to read device descriptor: "
-            << ConvertPlatformUsbErrorToString(rv);
-    return false;
-  }
-
-  if (desc.iProduct == 0) {
-    return false;
-  }
-
-  return GetStringDescriptor(desc.iProduct, product);
-}
-
-bool UsbDeviceHandleImpl::GetSerial(base::string16* serial) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  PlatformUsbDevice device = libusb_get_device(handle_);
-  libusb_device_descriptor desc;
-
-  // This is a non-blocking call as libusb has the descriptor in memory.
-  const int rv = libusb_get_device_descriptor(device, &desc);
-  if (rv != LIBUSB_SUCCESS) {
-    VLOG(1) << "Failed to read device descriptor: "
-            << ConvertPlatformUsbErrorToString(rv);
-    return false;
-  }
-
-  if (desc.iSerialNumber == 0) {
-    return false;
-  }
-
-  return GetStringDescriptor(desc.iSerialNumber, serial);
-}
-
 void UsbDeviceHandleImpl::ControlTransfer(
     const UsbEndpointDirection direction,
     const TransferRequestType request_type,
     const TransferRecipient recipient,
     const uint8 request,
     const uint16 value,
     const uint16 index,
     net::IOBuffer* buffer,
     const size_t length,
     const unsigned int timeout,
@@ skipping 232 matching lines @@
   // Attempt-release all the interfaces.
   // It will be retained until the transfer cancellation is finished.
   claimed_interfaces_.clear();
 
   // Cannot close device handle here. Need to wait for libusb_cancel_transfer to
   // finish.
   device_ = NULL;
 }
 
 }  // namespace device