Remove callbacks on USB manipulation methods.

chrome/browser/usb/usb_device_handle.h

 // Copyright 2013 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 CHROME_BROWSER_USB_USB_DEVICE_HANDLE_H_
 #define CHROME_BROWSER_USB_USB_DEVICE_HANDLE_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 25 matching lines @@
   USB_TRANSFER_TIMEOUT,
   USB_TRANSFER_CANCELLED,
   USB_TRANSFER_STALLED,
   USB_TRANSFER_DISCONNECT,
   USB_TRANSFER_OVERFLOW,
   USB_TRANSFER_LENGTH_SHORT,
 };
 
 typedef base::Callback<void(UsbTransferStatus, scoped_refptr<net::IOBuffer>,
     size_t)> UsbTransferCallback;
-typedef base::Callback<void(bool success)> UsbInterfaceCallback;
 
 // A UsbDevice wraps the platform's underlying representation of what a USB
 // device actually is, and provides accessors for performing many of the
 // standard USB operations.
 class UsbDeviceHandle : public base::RefCounted<UsbDeviceHandle> {
  public:
   enum TransferRequestType { STANDARD, CLASS, VENDOR, RESERVED };
   enum TransferRecipient { DEVICE, INTERFACE, ENDPOINT, OTHER };
 
   // Usually you will not want to directly create a UsbDevice, favoring to let
   // the UsbService take care of the logistics of getting a platform device
   // handle and handling events for it.
   UsbDeviceHandle(UsbService* service, PlatformUsbDeviceHandle handle);
 
   PlatformUsbDeviceHandle handle() { return handle_; }
 
-  // Close the USB device and release the underlying platform device. |callback|
-  // is invoked after the device has been closed.
-  virtual void Close(const base::Callback<void()>& callback);
+  // Close the USB device and release the underlying platform device.
+  virtual void Close();
 
-  virtual void ListInterfaces(UsbConfigDescriptor* config,
-                              const UsbInterfaceCallback& callback);
+  // Device manipulation operations. These methods are blocking.
+  virtual bool ListInterfaces(UsbConfigDescriptor* config);
+  virtual bool ClaimInterface(const int interface_number);
+  virtual bool ReleaseInterface(const int interface_number);
+  virtual bool SetInterfaceAlternateSetting(
+      const int interface_number,
+      const int alternate_setting);
+  virtual bool ResetDevice();
 
-  virtual void ClaimInterface(const int interface_number,
-                              const UsbInterfaceCallback& callback);
-
-  virtual void ReleaseInterface(const int interface_number,
-                                const UsbInterfaceCallback& callback);
-
-  virtual void SetInterfaceAlternateSetting(
-      const int interface_number,
-      const int alternate_setting,
-      const UsbInterfaceCallback& callback);
-
+  // Async IO.
   virtual void 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,
                                const UsbTransferCallback& callback);
@@ skipping 14 matching lines @@
 
   virtual void IsochronousTransfer(const UsbEndpointDirection direction,
                                    const uint8 endpoint,
                                    net::IOBuffer* buffer,
                                    const size_t length,
                                    const unsigned int packets,
                                    const unsigned int packet_length,
                                    const unsigned int timeout,
                                    const UsbTransferCallback& callback);
 
-  virtual void ResetDevice(const base::Callback<void(bool success)>& callback);
-
   // Normal code should not call this function. It is called by the platform's
   // callback mechanism in such a way that it cannot be made private. Invokes
   // the callbacks associated with a given transfer, and removes it from the
   // in-flight transfer set.
   void TransferComplete(PlatformUsbTransferHandle transfer);
 
  protected:
   // This constructor variant is for use in testing only.
   UsbDeviceHandle();
 
@@ skipping 33 matching lines @@
   // transfers_ tracks all in-flight transfers associated with this device,
   // allowing the device to retain the buffer and callback associated with a
   // transfer until such time that it completes. It is protected by lock_.
   base::Lock lock_;
   std::map<PlatformUsbTransferHandle, Transfer> transfers_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbDeviceHandle);
 };
 
 #endif  // CHROME_BROWSER_USB_USB_DEVICE_HANDLE_H_