chrome.hid : enrich device info with Top-Level collections usages

device/hid/hid_service_win.cc

Index: device/hid/hid_service_win.cc
diff --git a/device/hid/hid_service_win.cc b/device/hid/hid_service_win.cc
index e8f78d42b6aa7d5c2ab198d2845a757f2e17c632..d163c93af1dbf5b8d2f9c7ca6b68a012cb04fe8d 100644
--- a/device/hid/hid_service_win.cc
+++ b/device/hid/hid_service_win.cc
@@ -175,11 +175,13 @@ void HidServiceWin::PlatformAddDevice(const std::string& device_path) {
       preparsed_data) {
     HIDP_CAPS capabilities;
     if (HidP_GetCaps(preparsed_data, &capabilities) == HIDP_STATUS_SUCCESS) {
-      device_info.usage = capabilities.Usage;
-      device_info.usage_page = capabilities.UsagePage;
       device_info.input_report_size = capabilities.InputReportByteLength;
       device_info.output_report_size = capabilities.OutputReportByteLength;
       device_info.feature_report_size = capabilities.FeatureReportByteLength;
+      HidUsageAndPage usage_and_page;

[Ken Rockot(use gerrit already), 2014/04/24 17:29:50]

Actually please just rewrite this all in one line:

device_info.usages.push_back(HidUsageAndPage(
    capabilities.Usage,
    capabilities.UsagePage));

[jracle (use Gerrit), 2014/04/24 19:21:28]

Sure

+      usage_and_page.usage = capabilities.Usage;
+      usage_and_page.usage_page = capabilities.UsagePage;
+      device_info.usages.push_back(usage_and_page);
     }
     // Detect if the device supports report ids.
     if (capabilities.NumberInputValueCaps > 0) {