Revert of Implement basic USB device enumeration on Android.

device/usb/mock_usb_device.h

 // Copyright 2015 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_MOCK_USB_DEVICE_H_
 #define DEVICE_USB_MOCK_USB_DEVICE_H_
 
+#include "device/usb/usb_device.h"
+
 #include <stdint.h>
 
 #include <string>
-#include <vector>
 
-#include "device/usb/usb_device.h"
 #include "device/usb/usb_device_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace device {
 
 class MockUsbDevice : public UsbDevice {
  public:
   MockUsbDevice(uint16_t vendor_id, uint16_t product_id);
   MockUsbDevice(uint16_t vendor_id,
                 uint16_t product_id,
@@ skipping 10 matching lines @@
                 uint16_t product_id,
                 const UsbConfigDescriptor& configuration);
   MockUsbDevice(uint16_t vendor_id,
                 uint16_t product_id,
                 const std::string& manufacturer_string,
                 const std::string& product_string,
                 const std::string& serial_number,
                 const std::vector<UsbConfigDescriptor>& configurations);
 
   MOCK_METHOD1(Open, void(const OpenCallback&));
+  MOCK_METHOD1(Close, bool(scoped_refptr<UsbDeviceHandle>));
   MOCK_METHOD0(GetActiveConfiguration, const device::UsbConfigDescriptor*());
 
  private:
   ~MockUsbDevice() override;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_USB_MOCK_USB_DEVICE_H_