Revert 281282 "Revert 281133 "chrome.hid: enrich model with repo..."

trunk/src/device/hid/hid_device_info.h

Index: trunk/src/device/hid/hid_device_info.h
===================================================================
--- trunk/src/device/hid/hid_device_info.h	(revision 281299)
+++ trunk/src/device/hid/hid_device_info.h	(working copy)
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "device/hid/hid_usage_and_page.h"
+#include "device/hid/hid_collection_info.h"
 
 #if defined(OS_MACOSX)
 #include <IOKit/hid/IOHIDDevice.h>
@@ -34,20 +34,19 @@
   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