HID: Support top-level collection usages in device info.

device/hid/hid_service_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/hid/hid_service_win.h"
 
 #include <cstdlib>
 
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 157 matching lines @@
   for (ULONG i = 32;
       HidD_SetNumInputBuffers(device_handle.Get(), i);
       i <<= 1);
 
   // Get usage and usage page (optional).
   PHIDP_PREPARSED_DATA preparsed_data;
   if (HidD_GetPreparsedData(device_handle.Get(), &preparsed_data) &&
       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;
+      device_info.usages.push_back(HidUsageAndPage(
+        capabilities.Usage,
+        static_cast<HidUsageAndPage::Page>(capabilities.UsagePage)));
     }
     // Detect if the device supports report ids.
     if (capabilities.NumberInputValueCaps > 0) {
       scoped_ptr<HIDP_VALUE_CAPS[]> value_caps(
           new HIDP_VALUE_CAPS[capabilities.NumberInputValueCaps]);
       USHORT value_caps_length = capabilities.NumberInputValueCaps;
       if (HidP_GetValueCaps(HidP_Input, &value_caps[0], &value_caps_length,
                             preparsed_data) == HIDP_STATUS_SUCCESS) {
         device_info.has_report_id = (value_caps[0].ReportID != 0);
       }
@@ skipping 57 matching lines @@
     return NULL;
   scoped_refptr<HidConnectionWin> connection(new HidConnectionWin(device_info));
   if (!connection->available()) {
     LOG_GETLASTERROR(ERROR) << "Failed to open device.";
     return NULL;
   }
   return connection;
 }
 
 }  // namespace device