| Index: device/usb/mock_usb_device_handle.h
|
| diff --git a/device/usb/mock_usb_device_handle.h b/device/usb/mock_usb_device_handle.h
|
| index 26e61903ca957fe7a814dcc59f67d1a0c178e72c..372068cba489d6f146b94820cd580f9af10ea640 100644
|
| --- a/device/usb/mock_usb_device_handle.h
|
| +++ b/device/usb/mock_usb_device_handle.h
|
| @@ -5,12 +5,11 @@
|
| #ifndef DEVICE_USB_MOCK_USB_DEVICE_HANDLE_H_
|
| #define DEVICE_USB_MOCK_USB_DEVICE_HANDLE_H_
|
|
|
| +#include "device/usb/usb_device_handle.h"
|
| +
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include <vector>
|
| -
|
| -#include "device/usb/usb_device_handle.h"
|
| #include "net/base/io_buffer.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| @@ -18,7 +17,7 @@
|
|
|
| class MockUsbDeviceHandle : public UsbDeviceHandle {
|
| public:
|
| - explicit MockUsbDeviceHandle(UsbDevice* device);
|
| + MockUsbDeviceHandle(UsbDevice* device);
|
|
|
| scoped_refptr<UsbDevice> GetDevice() const override;
|
| MOCK_METHOD0(Close, void());
|
| @@ -45,17 +44,15 @@
|
| size_t length,
|
| unsigned int timeout,
|
| const TransferCallback& callback));
|
| - MOCK_METHOD4(IsochronousTransferIn,
|
| - void(uint8_t endpoint,
|
| - const std::vector<uint32_t>& packet_lengths,
|
| + MOCK_METHOD8(IsochronousTransfer,
|
| + void(UsbEndpointDirection direction,
|
| + uint8_t endpoint,
|
| + scoped_refptr<net::IOBuffer> buffer,
|
| + size_t length,
|
| + unsigned int packets,
|
| + unsigned int packet_length,
|
| unsigned int timeout,
|
| - const IsochronousTransferCallback& callback));
|
| - MOCK_METHOD5(IsochronousTransferOut,
|
| - void(uint8_t endpoint,
|
| - scoped_refptr<net::IOBuffer> buffer,
|
| - const std::vector<uint32_t>& packet_lengths,
|
| - unsigned int timeout,
|
| - const IsochronousTransferCallback& callback));
|
| + const TransferCallback& callback));
|
| MOCK_METHOD6(GenericTransfer,
|
| void(UsbEndpointDirection direction,
|
| uint8_t endpoint,
|
|
|