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

Unified Diff: device/hid/hid_connection_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_connection_mac.cc ('k') | device/hid/hid_connection_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/hid/hid_connection_unittest.cc
diff --git a/device/hid/hid_connection_unittest.cc b/device/hid/hid_connection_unittest.cc
index ab3841caacbb6e515e0cfc8a522ecff07ede5551..e474a6259c875d903adfb0e528ac2ed28455b3e2 100644
--- a/device/hid/hid_connection_unittest.cc
+++ b/device/hid/hid_connection_unittest.cc
@@ -62,19 +62,20 @@ class DeviceCatcher : HidService::Observer {
}
private:
- void OnEnumerationComplete(const std::vector<HidDeviceInfo>& devices) {
- for (const HidDeviceInfo& device_info : devices) {
- if (device_info.serial_number == serial_number_) {
- device_id_ = device_info.device_id;
+ void OnEnumerationComplete(
+ const std::vector<scoped_refptr<HidDeviceInfo>>& devices) {
+ for (const scoped_refptr<HidDeviceInfo>& device_info : devices) {
+ if (device_info->serial_number() == serial_number_) {
+ device_id_ = device_info->device_id();
run_loop_.Quit();
break;
}
}
}
- void OnDeviceAdded(const HidDeviceInfo& device_info) override {
- if (device_info.serial_number == serial_number_) {
- device_id_ = device_info.device_id;
+ void OnDeviceAdded(scoped_refptr<HidDeviceInfo> device_info) override {
+ if (device_info->serial_number() == serial_number_) {
+ device_id_ = device_info->device_id();
run_loop_.Quit();
}
}
« no previous file with comments | « device/hid/hid_connection_mac.cc ('k') | device/hid/hid_connection_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698