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

Tests still failed, undoing revert.

> Revert 281133 "chrome.hid: enrich model with report IDs"
> 
> Speculative revert to try and fix Win browser tests.
> 
> > chrome.hid: enrich model with report IDs
> > 
> > - add report IDs and max report size
> > - don't expose sensitive usages
> > 
> > BUG=364423
> > R=rockot@chromium.org
> > TESTS=run device_unittests (HidReportDescriptorTest)
> > 
> > Review URL: https://codereview.chromium.org/317783010
> 
> TBR=jracle@logitech.com
> 
> Review URL: https://codereview.chromium.org/369923002

TBR=csharp@chromium.org

Review URL: https://codereview.chromium.org/364213005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281300 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 4 deletions

diff --git a/device/hid/hid_report_descriptor.h b/device/hid/hid_report_descriptor.h
index fa67fa4..94d90ad 100644
--- a/device/hid/hid_report_descriptor.h
+++ b/device/hid/hid_report_descriptor.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
+#include "device/hid/hid_collection_info.h"
 #include "device/hid/hid_report_descriptor_item.h"
-#include "device/hid/hid_usage_and_page.h"
 
 namespace device {
 
@@ -25,9 +25,12 @@ class HidReportDescriptor {
     return items_;
   }
 
-  // Returns HID usages of top-level collections present in the descriptor.
-  void GetTopLevelCollections(
-      std::vector<HidUsageAndPage>* topLevelCollections);
+  // Returns top-level collections present in the descriptor,
+  // together with max report sizes
+  void GetDetails(std::vector<HidCollectionInfo>* top_level_collections,
+                  int* max_input_report_size,
+                  int* max_output_report_size,
+                  int* max_feature_report_size);
 
  private:
   std::vector<linked_ptr<HidReportDescriptorItem> > items_;