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

Unified Diff: chrome/browser/extensions/api/usb/usb_apitest.cc

Issue 16316004: Separate usb device handle from usb device. (deprecate) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows compile and a bug. Created 7 years, 6 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: chrome/browser/extensions/api/usb/usb_apitest.cc
diff --git a/chrome/browser/extensions/api/usb/usb_apitest.cc b/chrome/browser/extensions/api/usb/usb_apitest.cc
index 20f37d94c3ac91b040a08657a17421e290d9a107..a23d2e11659f7b738b0a53ecf569bdceea9117ea 100644
--- a/chrome/browser/extensions/api/usb/usb_apitest.cc
+++ b/chrome/browser/extensions/api/usb/usb_apitest.cc
@@ -39,9 +39,9 @@ ACTION_TEMPLATE(InvokeUsbResultCallback,
#pragma warning(push)
#pragma warning(disable:4373)
#endif
-class MockUsbDevice : public UsbDevice {
+class MockUsbDevice : public UsbDeviceHandle {
public:
- MockUsbDevice() : UsbDevice() {}
+ MockUsbDevice() : UsbDeviceHandle() {}
MOCK_METHOD1(Close, void(const base::Callback<void()>& callback));
@@ -116,8 +116,8 @@ IN_PROC_BROWSER_TEST_F(UsbApiTest, ListInterfaces) {
IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferEvent) {
EXPECT_CALL(*mock_device_.get(),
ControlTransfer(USB_DIRECTION_OUTBOUND,
- UsbDevice::STANDARD,
- UsbDevice::DEVICE,
+ UsbDeviceHandle::STANDARD,
+ UsbDeviceHandle::DEVICE,
1,
2,
3,

Powered by Google App Engine
This is Rietveld 408576698