Revert 281133 "chrome.hid: enrich model with report IDs"

trunk/src/device/hid/hid_device_info.h

 // 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.
 
 #ifndef DEVICE_HID_HID_DEVICE_INFO_H_
 #define DEVICE_HID_HID_DEVICE_INFO_H_
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
-#include "device/hid/hid_collection_info.h"
+#include "device/hid/hid_usage_and_page.h"
 
 #if defined(OS_MACOSX)
 #include <IOKit/hid/IOHIDDevice.h>
 #endif
 
 namespace device {
 
 enum HidBusType {
   kHIDBusTypeUSB = 0,
   kHIDBusTypeBluetooth = 1,
 };
 
 #if defined(OS_MACOSX)
 typedef IOHIDDeviceRef HidDeviceId;
 const HidDeviceId kInvalidHidDeviceId = NULL;
 #else
 typedef std::string HidDeviceId;
 extern const char kInvalidHidDeviceId[];
 #endif
 
 struct HidDeviceInfo {
   HidDeviceInfo();
   ~HidDeviceInfo();
 
-  // Device identification.
   HidDeviceId device_id;
+
+  HidBusType bus_type;
   uint16_t vendor_id;
   uint16_t product_id;
+
+  int input_report_size;
+  int output_report_size;
+  int feature_report_size;
+  std::vector<HidUsageAndPage> usages;
+  bool has_report_id;
+
   std::string product_name;
   std::string serial_number;
-  HidBusType bus_type;
-
-  // Top-Level Collections information.
-  std::vector<HidCollectionInfo> collections;
-  int max_input_report_size;
-  int max_output_report_size;
-  int max_feature_report_size;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_HID_HID_DEVICE_INFO_H_