Update webusb_descriptors.cc to parse the new WebUSB descriptors.

device/usb/usb_device.h

 // Copyright 2014 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_USB_DEVICE_H_
 #define DEVICE_USB_USB_DEVICE_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "device/usb/usb_descriptors.h"
 #include "url/gurl.h"
 
 namespace device {
 
 class UsbDeviceHandle;
-struct WebUsbDescriptorSet;
+struct WebUsbAllowedOrigins;
 
 // A UsbDevice object represents a detected USB device, providing basic
 // information about it. Methods other than simple property accessors must be
 // called from the thread on which this object was created. For further
 // manipulation of the device, a UsbDeviceHandle must be created from Open()
 // method.
 class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
  public:
   using OpenCallback = base::Callback<void(scoped_refptr<UsbDeviceHandle>)>;
   using ResultCallback = base::Callback<void(bool success)>;
 
   // A unique identifier which remains stable for the lifetime of this device
   // object (i.e., until the device is unplugged or the USB service dies.)
   const std::string& guid() const { return guid_; }
 
   // Accessors to basic information.
   uint16_t vendor_id() const { return vendor_id_; }
   uint16_t product_id() const { return product_id_; }
   const base::string16& manufacturer_string() const {
     return manufacturer_string_;
   }
   const base::string16& product_string() const { return product_string_; }
   const base::string16& serial_number() const { return serial_number_; }
-  const WebUsbDescriptorSet* webusb_allowed_origins() const {
+  const WebUsbAllowedOrigins* webusb_allowed_origins() const {
     return webusb_allowed_origins_.get();
   }
   const GURL& webusb_landing_page() const { return webusb_landing_page_; }
   const std::vector<UsbConfigDescriptor>& configurations() const {
     return configurations_;
   }
 
   // On ChromeOS the permission_broker service is used to change the ownership
   // of USB device nodes so that Chrome can open them. On other platforms these
   // functions are no-ops and always return true.
@@ skipping 13 matching lines @@
             const base::string16& product_string,
             const base::string16& serial_number);
   virtual ~UsbDevice();
 
   // These members must be mutable by subclasses as necessary during device
   // enumeration. To preserve the thread safety of this object they must remain
   // constant afterwards.
   base::string16 manufacturer_string_;
   base::string16 product_string_;
   base::string16 serial_number_;
-  scoped_ptr<WebUsbDescriptorSet> webusb_allowed_origins_;
+  scoped_ptr<WebUsbAllowedOrigins> webusb_allowed_origins_;
   GURL webusb_landing_page_;
 
   // All of the device's configuration descriptors.
   std::vector<UsbConfigDescriptor> configurations_;
 
  private:
   friend class base::RefCountedThreadSafe<UsbDevice>;
 
   const std::string guid_;
   const uint16_t vendor_id_;
   const uint16_t product_id_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbDevice);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_USB_USB_DEVICE_H_