Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2430)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/usb/mock_usb_device.h

Issue 1514603006: Implement basic USB device enumeration on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android_usb_browsertest.cc. Created 5 years 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
« device/usb/android/java/src/org/chromium/device/usb/ChromeUsbEndpoint.java ('K') | « device/usb/android/usb_jni_registrar.cc ('k') | device/usb/usb.gyp » ('j') | device/usb/usb_device_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/mock_usb_device.h
diff --git a/device/usb/mock_usb_device.h b/device/usb/mock_usb_device.h
index bed751c45fc8424460aa60b98e5af8cd862e022d..b8c3884159988ee1a5395ccee7edbace79663c9e 100644
--- a/device/usb/mock_usb_device.h
+++ b/device/usb/mock_usb_device.h
@@ -5,10 +5,10 @@
#ifndef DEVICE_USB_MOCK_USB_DEVICE_H_
#define DEVICE_USB_MOCK_USB_DEVICE_H_
-#include "device/usb/usb_device.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"
@@ -39,7 +39,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:
« device/usb/android/java/src/org/chromium/device/usb/ChromeUsbEndpoint.java ('K') | « device/usb/android/usb_jni_registrar.cc ('k') | device/usb/usb.gyp » ('j') | device/usb/usb_device_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698