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

Unified Diff: device/usb/usb_device_filter_unittest.cc

Issue 826283002: Add support for sending a USB SET_CONFIGURATION request. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
Index: device/usb/usb_device_filter_unittest.cc
diff --git a/device/usb/usb_device_filter_unittest.cc b/device/usb/usb_device_filter_unittest.cc
index cfd22251656fa363ecd687121a1009fe6ace17ba..1c3fb920cf0d8436d1733b245e77187647d495f7 100644
--- a/device/usb/usb_device_filter_unittest.cc
+++ b/device/usb/usb_device_filter_unittest.cc
@@ -16,20 +16,17 @@ namespace device {
namespace {
-using testing::NiceMock;
-using testing::ReturnRef;
+using testing::Return;
class MockUsbDevice : public UsbDevice {
public:
MockUsbDevice(uint16 vendor_id, uint16 product_id, uint32 unique_id)
: UsbDevice(vendor_id, product_id, unique_id) {}
+ MOCK_METHOD2(RequestUsbAccess, void(int, const base::Callback<void(bool)>&));
MOCK_METHOD0(Open, scoped_refptr<UsbDeviceHandle>());
MOCK_METHOD1(Close, bool(scoped_refptr<UsbDeviceHandle>));
-#if defined(OS_CHROMEOS)
- MOCK_METHOD2(RequestUsbAccess, void(int, const base::Callback<void(bool)>&));
-#endif
- MOCK_METHOD0(GetConfiguration, const UsbConfigDescriptor&());
+ MOCK_METHOD0(GetConfiguration, const device::UsbConfigDescriptor*());
MOCK_METHOD1(GetManufacturer, bool(base::string16*));
MOCK_METHOD1(GetProduct, bool(base::string16*));
MOCK_METHOD1(GetSerialNumber, bool(base::string16*));
@@ -51,7 +48,7 @@ class UsbFilterTest : public testing::Test {
android_phone_ = new MockUsbDevice(0x18d1, 0x4ee2, 0);
ON_CALL(*android_phone_.get(), GetConfiguration())
- .WillByDefault(ReturnRef(config_));
+ .WillByDefault(Return(&config_));
}
protected:

Powered by Google App Engine
This is Rietveld 408576698