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

Unified Diff: device/hid/hid_device_filter_unittest.cc

Issue 825523003: Convert HidDeviceInfo from a struct to a refcounted class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added TODO to remove friend class definitions. Created 5 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
« no previous file with comments | « device/hid/hid_device_filter.cc ('k') | device/hid/hid_device_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/hid/hid_device_filter_unittest.cc
diff --git a/device/hid/hid_device_filter_unittest.cc b/device/hid/hid_device_filter_unittest.cc
index aac87ff7cd4760dffd7a54886d3d3af2a8c539d4..a59adea3afd1c2166633e92f42ddef6a60119f41 100644
--- a/device/hid/hid_device_filter_unittest.cc
+++ b/device/hid/hid_device_filter_unittest.cc
@@ -8,22 +8,21 @@
namespace device {
-namespace {
-
class HidFilterTest : public testing::Test {
public:
void SetUp() override {
- device_info_.vendor_id = 0x046d;
- device_info_.product_id = 0xc31c;
+ device_info_ = new HidDeviceInfo();
+ device_info_->vendor_id_ = 0x046d;
+ device_info_->product_id_ = 0xc31c;
HidCollectionInfo collection;
collection.usage.usage_page = HidUsageAndPage::kPageKeyboard;
collection.usage.usage = 0x01;
- device_info_.collections.push_back(collection);
+ device_info_->collections_.push_back(collection);
}
protected:
- HidDeviceInfo device_info_;
+ scoped_refptr<HidDeviceInfo> device_info_;
};
TEST_F(HidFilterTest, MatchAny) {
@@ -111,6 +110,4 @@ TEST_F(HidFilterTest, MatchFilterListNegative) {
ASSERT_FALSE(HidDeviceFilter::MatchesAny(device_info_, filters));
}
-} // namespace
-
} // namespace device
« no previous file with comments | « device/hid/hid_device_filter.cc ('k') | device/hid/hid_device_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698