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, 19 insertions, 312 deletions

diff --git a/device/hid/hid_report_descriptor_unittest.cc b/device/hid/hid_report_descriptor_unittest.cc
index d202236..308780c 100644
--- a/device/hid/hid_report_descriptor_unittest.cc
+++ b/device/hid/hid_report_descriptor_unittest.cc
@@ -5,6 +5,7 @@
 #include <sstream>
 
 #include "device/hid/hid_report_descriptor.h"
+#include "device/hid/test_report_descriptors.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -12,277 +13,6 @@ using namespace testing;
 
 namespace device {
 
-namespace {
-
-// Digitizer descriptor from HID descriptor tool
-// http://www.usb.org/developers/hidpage/dt2_4.zip
-const uint8_t kDigitizer[] = {
-    0x05, 0x0d,        // Usage Page (Digitizer)
-    0x09, 0x01,        // Usage (0x1)
-    0xa1, 0x01,        // Collection (Application)
-    0x85, 0x01,        //  Report ID (0x1)
-    0x09, 0x21,        //  Usage (0x21)
-    0xa1, 0x00,        //  Collection (Physical)
-    0x05, 0x01,        //   Usage Page (Generic Desktop)
-    0x09, 0x30,        //   Usage (0x30)
-    0x09, 0x31,        //   Usage (0x31)
-    0x75, 0x10,        //   Report Size (16)
-    0x95, 0x02,        //   Report Count (2)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x26, 0xe0, 0x2e,  //   Logical Maximum (12000)
-    0x35, 0x00,        //   Physical Minimum (0)
-    0x45, 0x0c,        //   Physical Maximum (12)
-    0x65, 0x13,        //   Unit (19)
-    0x55, 0x00,        //   Unit Exponent (0)
-    0xa4,              //   Push
-    0x81, 0x02,        //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x05, 0x0d,        //   Usage Page (Digitizer)
-    0x09, 0x32,        //   Usage (0x32)
-    0x09, 0x44,        //   Usage (0x44)
-    0x09, 0x42,        //   Usage (0x42)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x25, 0x01,        //   Logical Maximum (1)
-    0x35, 0x00,        //   Physical Minimum (0)
-    0x45, 0x01,        //   Physical Maximum (1)
-    0x75, 0x01,        //   Report Size (1)
-    0x95, 0x03,        //   Report Count (3)
-    0x65, 0x00,        //   Unit (0)
-    0x81, 0x02,        //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x01,        //   Report Count (1)
-    0x75, 0x05,        //   Report Size (5)
-    0x81, 0x03,        //   Input (Con|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xc0,              //  End Collection
-    0x85, 0x02,        //  Report ID (0x2)
-    0x09, 0x20,        //  Usage (0x20)
-    0xa1, 0x00,        //  Collection (Physical)
-    0xb4,              //   Pop
-    0xa4,              //   Push
-    0x09, 0x30,        //   Usage (0x30)
-    0x09, 0x31,        //   Usage (0x31)
-    0x81, 0x02,        //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x05, 0x0d,        //   Usage Page (Digitizer)
-    0x09, 0x32,        //   Usage (0x32)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x25, 0x01,        //   Logical Maximum (1)
-    0x35, 0x00,        //   Physical Minimum (0)
-    0x45, 0x01,        //   Physical Maximum (1)
-    0x65, 0x00,        //   Unit (0)
-    0x75, 0x01,        //   Report Size (1)
-    0x81, 0x02,        //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x05, 0x09,        //   Usage Page (Button)
-    0x19, 0x00,        //   Usage Minimum (0)
-    0x29, 0x10,        //   Usage Maximum (16)
-    0x25, 0x10,        //   Logical Maximum (16)
-    0x75, 0x05,        //   Report Size (5)
-    0x81, 0x40,        //   Input (Dat|Var|Rel|NoWrp|Lin|Prf|Null|BitF)
-    0x75, 0x02,        //   Report Size (2)
-    0x81, 0x01,        //   Input (Con|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xc0,              //  End Collection
-    0x85, 0x03,        //  Report ID (0x3)
-    0x05, 0x0d,        //  Usage Page (Digitizer)
-    0x09, 0x20,        //  Usage (0x20)
-    0xa1, 0x00,        //  Collection (Physical)
-    0xb4,              //   Pop
-    0x09, 0x30,        //   Usage (0x30)
-    0x09, 0x31,        //   Usage (0x31)
-    0x81, 0x02,        //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x05, 0x0d,        //   Usage Page (Digitizer)
-    0x09, 0x32,        //   Usage (0x32)
-    0x09, 0x44,        //   Usage (0x44)
-    0x75, 0x01,        //   Report Size (1)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x25, 0x01,        //   Logical Maximum (1)
-    0x35, 0x00,        //   Physical Minimum (0)
-    0x45, 0x01,        //   Physical Maximum (1)
-    0x65, 0x00,        //   Unit (0)
-    0x81, 0x02,        //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x06,        //   Report Count (6)
-    0x81, 0x03,        //   Input (Con|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x09, 0x30,        //   Usage (0x30)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x25, 0x7f,        //   Logical Maximum (127)
-    0x35, 0x00,        //   Physical Minimum (0)
-    0x45, 0x2d,        //   Physical Maximum (45)
-    0x67, 0x11, 0xe1,  //   Unit (57617)
-    0x00, 0x00,        //   Default
-    0x55, 0x04,        //   Unit Exponent (4)
-    0x75, 0x08,        //   Report Size (8)
-    0x95, 0x01,        //   Report Count (1)
-    0x81, 0x12,        //   Input (Dat|Arr|Rel|NoWrp|NoLin|Prf|NoNull|BitF)
-    0xc0,              //  End Collection
-    0xc0               // End Collection
-};
-
-// Keyboard descriptor from HID descriptor tool
-// http://www.usb.org/developers/hidpage/dt2_4.zip
-const uint8_t kKeyboard[] = {
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (0x6)
-    0xa1, 0x01,  // Collection (Application)
-    0x05, 0x07,  //  Usage Page (Keyboard)
-    0x19, 0xe0,  //  Usage Minimum (224)
-    0x29, 0xe7,  //  Usage Maximum (231)
-    0x15, 0x00,  //  Logical Minimum (0)
-    0x25, 0x01,  //  Logical Maximum (1)
-    0x75, 0x01,  //  Report Size (1)
-    0x95, 0x08,  //  Report Count (8)
-    0x81, 0x02,  //  Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x01,  //  Report Count (1)
-    0x75, 0x08,  //  Report Size (8)
-    0x81, 0x03,  //  Input (Con|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x05,  //  Report Count (5)
-    0x75, 0x01,  //  Report Size (1)
-    0x05, 0x08,  //  Usage Page (Led)
-    0x19, 0x01,  //  Usage Minimum (1)
-    0x29, 0x05,  //  Usage Maximum (5)
-    0x91, 0x02,  //  Output (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x01,  //  Report Count (1)
-    0x75, 0x03,  //  Report Size (3)
-    0x91, 0x03,  //  Output (Con|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x06,  //  Report Count (6)
-    0x75, 0x08,  //  Report Size (8)
-    0x15, 0x00,  //  Logical Minimum (0)
-    0x25, 0x65,  //  Logical Maximum (101)
-    0x05, 0x07,  //  Usage Page (Keyboard)
-    0x19, 0x00,  //  Usage Minimum (0)
-    0x29, 0x65,  //  Usage Maximum (101)
-    0x81, 0x00,  //  Input (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xc0         // End Collection
-};
-
-// Monitor descriptor from HID descriptor tool
-// http://www.usb.org/developers/hidpage/dt2_4.zip
-const uint8_t kMonitor[] = {
-    0x05, 0x80,        // Usage Page (Monitor 0)
-    0x09, 0x01,        // Usage (0x1)
-    0xa1, 0x01,        // Collection (Application)
-    0x85, 0x01,        //  Report ID (0x1)
-    0x15, 0x00,        //  Logical Minimum (0)
-    0x26, 0xff, 0x00,  //  Logical Maximum (255)
-    0x75, 0x08,        //  Report Size (8)
-    0x95, 0x80,        //  Report Count (128)
-    0x09, 0x02,        //  Usage (0x2)
-    0xb2, 0x02, 0x01,  //  Feature (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|Buff)
-    0x85, 0x02,        //  Report ID (0x2)
-    0x95, 0xf3,        //  Report Count (243)
-    0x09, 0x03,        //  Usage (0x3)
-    0xb2, 0x02, 0x01,  //  Feature (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|Buff)
-    0x85, 0x03,        //  Report ID (0x3)
-    0x05, 0x82,        //  Usage Page (Monitor 2)
-    0x95, 0x01,        //  Report Count (1)
-    0x75, 0x10,        //  Report Size (16)
-    0x26, 0xc8, 0x00,  //  Logical Maximum (200)
-    0x09, 0x10,        //  Usage (0x10)
-    0xb1, 0x02,        //  Feature (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x85, 0x04,        //  Report ID (0x4)
-    0x25, 0x64,        //  Logical Maximum (100)
-    0x09, 0x12,        //  Usage (0x12)
-    0xb1, 0x02,        //  Feature (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x06,        //  Report Count (6)
-    0x26, 0xff, 0x00,  //  Logical Maximum (255)
-    0x09, 0x16,        //  Usage (0x16)
-    0x09, 0x18,        //  Usage (0x18)
-    0x09, 0x1a,        //  Usage (0x1A)
-    0x09, 0x6c,        //  Usage (0x6C)
-    0x09, 0x6e,        //  Usage (0x6E)
-    0x09, 0x70,        //  Usage (0x70)
-    0xb1, 0x02,        //  Feature (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x85, 0x05,        //  Report ID (0x5)
-    0x25, 0x7f,        //  Logical Maximum (127)
-    0x09, 0x20,        //  Usage (0x20)
-    0x09, 0x22,        //  Usage (0x22)
-    0x09, 0x30,        //  Usage (0x30)
-    0x09, 0x32,        //  Usage (0x32)
-    0x09, 0x42,        //  Usage (0x42)
-    0x09, 0x44,        //  Usage (0x44)
-    0xb1, 0x02,        //  Feature (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xc0               // End Collection
-};
-
-// Mouse descriptor from HID descriptor tool
-// http://www.usb.org/developers/hidpage/dt2_4.zip
-const uint8_t kMouse[] = {
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x02,  // Usage (0x2)
-    0xa1, 0x01,  // Collection (Application)
-    0x09, 0x01,  //  Usage (0x1)
-    0xa1, 0x00,  //  Collection (Physical)
-    0x05, 0x09,  //   Usage Page (Button)
-    0x19, 0x01,  //   Usage Minimum (1)
-    0x29, 0x03,  //   Usage Maximum (3)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x03,  //   Report Count (3)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Dat|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x05,  //   Report Size (5)
-    0x81, 0x03,  //   Input (Con|Arr|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x05, 0x01,  //   Usage Page (Generic Desktop)
-    0x09, 0x30,  //   Usage (0x30)
-    0x09, 0x31,  //   Usage (0x31)
-    0x15, 0x81,  //   Logical Minimum (129)
-    0x25, 0x7f,  //   Logical Maximum (127)
-    0x75, 0x08,  //   Report Size (8)
-    0x95, 0x02,  //   Report Count (2)
-    0x81, 0x06,  //   Input (Dat|Arr|Abs|NoWrp|Lin|Prf|NoNull|BitF)
-    0xc0,        //  End Collection
-    0xc0         // End Collection
-};
-
-// Logitech Unifying receiver descriptor
-const uint8_t kLogitechUnifyingReceiver[] = {
-    0x06, 0x00, 0xFF,  // Usage Page (Vendor)
-    0x09, 0x01,        // Usage (0x1)
-    0xA1, 0x01,        // Collection (Application)
-    0x85, 0x10,        //  Report ID (0x10)
-    0x75, 0x08,        //  Report Size (8)
-    0x95, 0x06,        //  Report Count (6)
-    0x15, 0x00,        //  Logical Minimum (0)
-    0x26, 0xFF, 0x00,  //  Logical Maximum (255)
-    0x09, 0x01,        //  Usage (0x1)
-    0x81, 0x00,        //  Input (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x09, 0x01,        //  Usage (0x1)
-    0x91, 0x00,        //  Output (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xC0,              // End Collection
-    0x06, 0x00, 0xFF,  // Usage Page (Vendor)
-    0x09, 0x02,        // Usage (0x2)
-    0xA1, 0x01,        // Collection (Application)
-    0x85, 0x11,        //  Report ID (0x11)
-    0x75, 0x08,        //  Report Size (8)
-    0x95, 0x13,        //  Report Count (19)
-    0x15, 0x00,        //  Logical Minimum (0)
-    0x26, 0xFF, 0x00,  //  Logical Maximum (255)
-    0x09, 0x02,        //  Usage (0x2)
-    0x81, 0x00,        //  Input (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x09, 0x02,        //  Usage (0x2)
-    0x91, 0x00,        //  Output (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xC0,              // End Collection
-    0x06, 0x00, 0xFF,  // Usage Page (Vendor)
-    0x09, 0x04,        // Usage (0x4)
-    0xA1, 0x01,        // Collection (Application)
-    0x85, 0x20,        //  Report ID (0x20)
-    0x75, 0x08,        //  Report Size (8)
-    0x95, 0x0E,        //  Report Count (14)
-    0x15, 0x00,        //  Logical Minimum (0)
-    0x26, 0xFF, 0x00,  //  Logical Maximum (255)
-    0x09, 0x41,        //  Usage (0x41)
-    0x81, 0x00,        //  Input (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x09, 0x41,        //  Usage (0x41)
-    0x91, 0x00,        //  Output (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x85, 0x21,        //  Report ID (0x21)
-    0x95, 0x1F,        //  Report Count (31)
-    0x15, 0x00,        //  Logical Minimum (0)
-    0x26, 0xFF, 0x00,  //  Logical Maximum (255)
-    0x09, 0x42,        //  Usage (0x42)
-    0x81, 0x00,        //  Input (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0x09, 0x42,        //  Usage (0x42)
-    0x91, 0x00,        //  Output (Dat|Var|Rel|NoWrp|Lin|Prf|NoNull|BitF)
-    0xC0               // End Collection
-};
-
-}  // namespace
-
 class HidReportDescriptorTest : public testing::Test {
 
  protected:
@@ -303,7 +33,8 @@ class HidReportDescriptorTest : public testing::Test {
       const size_t expected_max_feature_report_size,
       const uint8_t* bytes,
       size_t size) {
-    descriptor_ = new HidReportDescriptor(bytes, size);
+    descriptor_ =
+        new HidReportDescriptor(std::vector<uint8>(bytes, bytes + size));
 
     std::vector<HidCollectionInfo> actual_collections;
     bool actual_has_report_id;
@@ -355,28 +86,18 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_Digitizer) {
   digitizer.report_ids.insert(2);
   digitizer.report_ids.insert(3);
   HidCollectionInfo expected[] = {digitizer};
-  ValidateDetails(std::vector<HidCollectionInfo>(
-                      expected, expected + arraysize(expected)),
-                  true,
-                  6,
-                  0,
-                  0,
-                  kDigitizer,
-                  sizeof(kDigitizer));
+  ValidateDetails(
+      std::vector<HidCollectionInfo>(expected, expected + arraysize(expected)),
+      true, 6, 0, 0, kDigitizer, kDigitizerSize);
 }
 
 TEST_F(HidReportDescriptorTest, ValidateDetails_Keyboard) {
   HidCollectionInfo keyboard;
   keyboard.usage = HidUsageAndPage(0x06, HidUsageAndPage::kPageGenericDesktop);
   HidCollectionInfo expected[] = {keyboard};
-  ValidateDetails(std::vector<HidCollectionInfo>(
-                      expected, expected + arraysize(expected)),
-                  false,
-                  8,
-                  1,
-                  0,
-                  kKeyboard,
-                  sizeof(kKeyboard));
+  ValidateDetails(
+      std::vector<HidCollectionInfo>(expected, expected + arraysize(expected)),
+      false, 8, 1, 0, kKeyboard, kKeyboardSize);
 }
 
 TEST_F(HidReportDescriptorTest, ValidateDetails_Monitor) {
@@ -388,28 +109,18 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_Monitor) {
   monitor.report_ids.insert(4);
   monitor.report_ids.insert(5);
   HidCollectionInfo expected[] = {monitor};
-  ValidateDetails(std::vector<HidCollectionInfo>(
-                      expected, expected + arraysize(expected)),
-                  true,
-                  0,
-                  0,
-                  243,
-                  kMonitor,
-                  sizeof(kMonitor));
+  ValidateDetails(
+      std::vector<HidCollectionInfo>(expected, expected + arraysize(expected)),
+      true, 0, 0, 243, kMonitor, kMonitorSize);
 }
 
 TEST_F(HidReportDescriptorTest, ValidateDetails_Mouse) {
   HidCollectionInfo mouse;
   mouse.usage = HidUsageAndPage(0x02, HidUsageAndPage::kPageGenericDesktop);
   HidCollectionInfo expected[] = {mouse};
-  ValidateDetails(std::vector<HidCollectionInfo>(
-                      expected, expected + arraysize(expected)),
-                  false,
-                  3,
-                  0,
-                  0,
-                  kMouse,
-                  sizeof(kMouse));
+  ValidateDetails(
+      std::vector<HidCollectionInfo>(expected, expected + arraysize(expected)),
+      false, 3, 0, 0, kMouse, kMouseSize);
 }
 
 TEST_F(HidReportDescriptorTest, ValidateDetails_LogitechUnifyingReceiver) {
@@ -425,14 +136,10 @@ TEST_F(HidReportDescriptorTest, ValidateDetails_LogitechUnifyingReceiver) {
   hidpp_dj.report_ids.insert(0x21);
 
   HidCollectionInfo expected[] = {hidpp_short, hidpp_long, hidpp_dj};
-  ValidateDetails(std::vector<HidCollectionInfo>(
-                      expected, expected + arraysize(expected)),
-                  true,
-                  31,
-                  31,
-                  0,
-                  kLogitechUnifyingReceiver,
-                  sizeof(kLogitechUnifyingReceiver));
+  ValidateDetails(
+      std::vector<HidCollectionInfo>(expected, expected + arraysize(expected)),
+      true, 31, 31, 0, kLogitechUnifyingReceiver,
+      kLogitechUnifyingReceiverSize);
 }
 
 }  // namespace device