Update webusb_descriptors.cc to parse the new WebUSB descriptors.

device/usb/webusb_descriptors.h

 // Copyright 2015 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_USB_WEBUSB_DESCRIPTORS_H_
 #define DEVICE_USB_WEBUSB_DESCRIPTORS_H_
 
 #include <stdint.h>
 #include <vector>
 
+#include "base/callback_forward.h"
+#include "base/memory/ref_counted.h"
 #include "url/gurl.h"
 
 namespace device {
 
+class UsbDeviceHandle;
+
 struct WebUsbFunctionSubset {
   WebUsbFunctionSubset();
   ~WebUsbFunctionSubset();
 
   uint8_t first_interface;
+  std::vector<uint8_t> origin_ids;
   std::vector<GURL> origins;
 };
 
 struct WebUsbConfigurationSubset {
   WebUsbConfigurationSubset();
   ~WebUsbConfigurationSubset();
 
   uint8_t configuration_value;
+  std::vector<uint8_t> origin_ids;
   std::vector<GURL> origins;
   std::vector<WebUsbFunctionSubset> functions;
 };
 
-struct WebUsbDescriptorSet {
-  WebUsbDescriptorSet();
-  ~WebUsbDescriptorSet();
+struct WebUsbAllowedOrigins {
+  WebUsbAllowedOrigins();
+  ~WebUsbAllowedOrigins();
 
   bool Parse(const std::vector<uint8_t>& bytes);
 
+  std::vector<uint8_t> origin_ids;
   std::vector<GURL> origins;
   std::vector<WebUsbConfigurationSubset> configurations;
 };
 
 struct WebUsbPlatformCapabilityDescriptor {
   WebUsbPlatformCapabilityDescriptor();
   ~WebUsbPlatformCapabilityDescriptor();
 
   bool ParseFromBosDescriptor(const std::vector<uint8_t>& bytes);
 
   uint16_t version;
   uint8_t vendor_code;
+  uint8_t landing_page_id;
+  GURL landing_page;
 };
 
 bool ParseWebUsbUrlDescriptor(const std::vector<uint8_t>& bytes, GURL* output);
 
+void ReadWebUsbDescriptors(
+    scoped_refptr<UsbDeviceHandle> device_handle,
+    const base::Callback<void(scoped_ptr<WebUsbAllowedOrigins> allowed_origins,
+                              const GURL& landing_page)>& callback);
+
 }  // device
 
 #endif  // DEVICE_USB_WEBUSB_DESCRIPTORS_H_