device/usb/mock_usb_device.h - Issue 1565313002: Reland of Implement basic USB device enumeration on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/usb/mock_usb_device.h

Issue 1565313002: Reland of Implement basic USB device enumeration on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Dependency fix added to reland. Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: device/usb/mock_usb_device.h

diff --git a/device/usb/mock_usb_device.h b/device/usb/mock_usb_device.h

index c25a915b755b5592419a0ecbd56c3bec481b6f6c..91bb0bb7be9f27cce34f2483ab9d0b8897b3d95d 100644

--- a/device/usb/mock_usb_device.h

+++ b/device/usb/mock_usb_device.h

@@ -5,12 +5,12 @@

#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"

@@ -41,7 +41,6 @@ class MockUsbDevice : public UsbDevice {

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:

« no previous file with comments | « device/usb/android/usb_jni_registrar.cc ('k') | device/usb/usb.gyp » ('j') | no next file with comments »