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

Unified Diff: device/usb/usb_device_filter_unittest.cc

Issue 1144493003: Extract //device/usb mocks so that they can be shared. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Android and GN builds for real. Created 5 years, 7 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
« no previous file with comments | « device/usb/usb.gyp ('k') | extensions/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 beb12dfa1c251e9962d00189dd54b207a30ad55f..5ed3db9a04bc175cc2490348516ec4e22ff80b11 100644
--- a/device/usb/usb_device_filter_unittest.cc
+++ b/device/usb/usb_device_filter_unittest.cc
@@ -5,10 +5,9 @@
#include <vector>
#include "base/memory/ref_counted.h"
+#include "device/usb/mock_usb_device.h"
#include "device/usb/usb_descriptors.h"
-#include "device/usb/usb_device.h"
#include "device/usb/usb_device_filter.h"
-#include "device/usb/usb_device_handle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -18,24 +17,6 @@ namespace {
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,
- base::string16(),
- base::string16(),
- base::string16()) {}
-
- MOCK_METHOD1(Open, void(const OpenCallback&));
- MOCK_METHOD1(Close, bool(scoped_refptr<UsbDeviceHandle>));
- MOCK_METHOD0(GetConfiguration, const device::UsbConfigDescriptor*());
-
- private:
- virtual ~MockUsbDevice() {}
-};
-
class UsbFilterTest : public testing::Test {
public:
void SetUp() override {
@@ -47,7 +28,7 @@ class UsbFilterTest : public testing::Test {
interface.interface_protocol = 0x01;
config_.interfaces.push_back(interface);
- android_phone_ = new MockUsbDevice(0x18d1, 0x4ee2, 0);
+ android_phone_ = new MockUsbDevice(0x18d1, 0x4ee2);
}
protected:
« no previous file with comments | « device/usb/usb.gyp ('k') | extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698