Include raw HID report descriptor in HID device info.

This change includes the raw HID report descriptor in the HidDeviceInfo
class and exposes it to apps and extensions using the chrome.hid API.
For simplicity on OS X the platform APIs for collecting information from
the report descriptor are no longer used and instead the parsing code
from Linux is used. On Windows the raw HID report descriptor is not
available because Windows exposes HID devices on a per-top-level
collection basis.

BUG=442818

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

Cr-Commit-Position: refs/heads/master@{#311192}

1 files changed, 10 insertions, 14 deletions

diff --git a/device/hid/hid_device_filter_unittest.cc b/device/hid/hid_device_filter_unittest.cc
index a59adea..233cb2c 100644
--- a/device/hid/hid_device_filter_unittest.cc
+++ b/device/hid/hid_device_filter_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "device/hid/hid_device_filter.h"
 #include "device/hid/hid_device_info.h"
+#include "device/hid/test_report_descriptors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device {
@@ -11,14 +12,9 @@ namespace device {
 class HidFilterTest : public testing::Test {
  public:
   void SetUp() override {
-    device_info_ = new HidDeviceInfo();
-    device_info_->vendor_id_ = 0x046d;
-    device_info_->product_id_ = 0xc31c;
-
-    HidCollectionInfo collection;
-    collection.usage.usage_page = HidUsageAndPage::kPageKeyboard;
-    collection.usage.usage = 0x01;
-    device_info_->collections_.push_back(collection);
+    device_info_ = new HidDeviceInfo(
+        "device1", 0x046d, 0xc31c, "Test Keyboard", "123ABC", kHIDBusTypeUSB,
+        std::vector<uint8>(kKeyboard, kKeyboard + kKeyboardSize));
   }
 
  protected:
@@ -58,7 +54,7 @@ TEST_F(HidFilterTest, MatchProductIdNegative) {
 
 TEST_F(HidFilterTest, MatchUsagePage) {
   HidDeviceFilter filter;
-  filter.SetUsagePage(HidUsageAndPage::kPageKeyboard);
+  filter.SetUsagePage(HidUsageAndPage::kPageGenericDesktop);
   ASSERT_TRUE(filter.Matches(device_info_));
 }
 
@@ -71,20 +67,20 @@ TEST_F(HidFilterTest, MatchUsagePageNegative) {
 TEST_F(HidFilterTest, MatchVendorAndUsagePage) {
   HidDeviceFilter filter;
   filter.SetVendorId(0x046d);
-  filter.SetUsagePage(HidUsageAndPage::kPageKeyboard);
+  filter.SetUsagePage(HidUsageAndPage::kPageGenericDesktop);
   ASSERT_TRUE(filter.Matches(device_info_));
 }
 
 TEST_F(HidFilterTest, MatchUsageAndPage) {
   HidDeviceFilter filter;
-  filter.SetUsagePage(HidUsageAndPage::kPageKeyboard);
-  filter.SetUsage(0x01);
+  filter.SetUsagePage(HidUsageAndPage::kPageGenericDesktop);
+  filter.SetUsage(HidUsageAndPage::kGenericDesktopKeyboard);
   ASSERT_TRUE(filter.Matches(device_info_));
 }
 
 TEST_F(HidFilterTest, MatchUsageAndPageNegative) {
   HidDeviceFilter filter;
-  filter.SetUsagePage(HidUsageAndPage::kPageKeyboard);
+  filter.SetUsagePage(HidUsageAndPage::kPageGenericDesktop);
   filter.SetUsage(0x02);
   ASSERT_FALSE(filter.Matches(device_info_));
 }
@@ -97,7 +93,7 @@ TEST_F(HidFilterTest, MatchEmptyFilterListNegative) {
 TEST_F(HidFilterTest, MatchFilterList) {
   std::vector<HidDeviceFilter> filters;
   HidDeviceFilter filter;
-  filter.SetUsagePage(HidUsageAndPage::kPageKeyboard);
+  filter.SetUsagePage(HidUsageAndPage::kPageGenericDesktop);
   filters.push_back(filter);
   ASSERT_TRUE(HidDeviceFilter::MatchesAny(device_info_, filters));
 }