Update webusb_descriptors.cc to parse the new WebUSB descriptors.

chrome/browser/usb/usb_chooser_bubble_delegate.cc

 // 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.
 
 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
   WEBUSB_CHOOSER_CLOSED_EPHEMERAL_PERMISSION_GRANTED,
   // Maximum value for the enum.
   WEBUSB_CHOOSER_CLOSED_MAX
 };
 
 void RecordChooserClosure(WebUsbChooserClosed disposition) {
   UMA_HISTOGRAM_ENUMERATION("WebUsb.ChooserClosed", disposition,
                             WEBUSB_CHOOSER_CLOSED_MAX);
 }
 
-// Check if the origin is in the description set.
-bool FindOriginInDescriptorSet(const device::WebUsbDescriptorSet* set,
-                               const GURL& origin) {
-  if (!set)
+// Check if the origin is allowed.
+bool FindInAllowedOrigins(const device::WebUsbAllowedOrigins* allowed_origins,
+                          const GURL& origin) {
+  if (!allowed_origins)
     return false;
 
-  if (ContainsValue(set->origins, origin))
+  if (ContainsValue(allowed_origins->origins, origin))
     return true;
 
-  for (const auto& config : set->configurations) {
+  for (const auto& config : allowed_origins->configurations) {
     if (ContainsValue(config.origins, origin))
       return true;
 
     for (const auto& function : config.functions) {
       if (ContainsValue(function.origins, origin))
         return true;
     }
   }
 
   return false;
@@ skipping 74 matching lines @@
 
   if (bubble_controller_)
     bubble_controller_->CloseBubble(BUBBLE_CLOSE_CANCELED);
 }
 
 void UsbChooserBubbleDelegate::Close() {}
 
 void UsbChooserBubbleDelegate::OnDeviceAdded(
     scoped_refptr<device::UsbDevice> device) {
   if (device::UsbDeviceFilter::MatchesAny(device, filters_) &&
-      FindOriginInDescriptorSet(
+      FindInAllowedOrigins(
           device->webusb_allowed_origins(),
           render_frame_host_->GetLastCommittedURL().GetOrigin())) {
     devices_.push_back(std::make_pair(device, device->product_string()));
     if (observer())
       observer()->OnOptionAdded(devices_.size() - 1);
   }
 }
 
 void UsbChooserBubbleDelegate::OnDeviceRemoved(
     scoped_refptr<device::UsbDevice> device) {
   for (auto it = devices_.begin(); it != devices_.end(); ++it) {
     if (it->first == device) {
       size_t index = it - devices_.begin();
       devices_.erase(it);
       if (observer())
         observer()->OnOptionRemoved(index);
       return;
     }
   }
 }
 
 // Get a list of devices that can be shown in the chooser bubble UI for
 // user to grant permsssion.
 void UsbChooserBubbleDelegate::GotUsbDeviceList(
     const std::vector<scoped_refptr<device::UsbDevice>>& devices) {
   for (const auto& device : devices) {
     if (device::UsbDeviceFilter::MatchesAny(device, filters_) &&
-        FindOriginInDescriptorSet(
+        FindInAllowedOrigins(
             device->webusb_allowed_origins(),
             render_frame_host_->GetLastCommittedURL().GetOrigin())) {
       devices_.push_back(std::make_pair(device, device->product_string()));
     }
   }
   if (observer())
     observer()->OnOptionsInitialized();
 }
 
 void UsbChooserBubbleDelegate::set_bubble_controller(
     BubbleReference bubble_controller) {
   bubble_controller_ = bubble_controller;
 }