Update webusb_descriptors.cc to parse the new WebUSB descriptors.

device/devices_app/usb/type_converters.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 "device/devices_app/usb/type_converters.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 218 matching lines @@
   info->configuration_value = config.configuration_value;
   info->origins = mojo::Array<mojo::String>::From(config.origins);
   info->functions =
       mojo::Array<device::usb::WebUsbFunctionSubsetPtr>::From(config.functions);
   return info;
 }
 
 // static
 device::usb::WebUsbDescriptorSetPtr TypeConverter<
     device::usb::WebUsbDescriptorSetPtr,
-    device::WebUsbDescriptorSet>::Convert(const device::WebUsbDescriptorSet&
-                                              set) {
+    device::WebUsbAllowedOrigins>::Convert(const device::WebUsbAllowedOrigins&
+                                               allowed_origins) {
   device::usb::WebUsbDescriptorSetPtr info =
       device::usb::WebUsbDescriptorSet::New();
-  info->origins = mojo::Array<mojo::String>::From(set.origins);
+  info->origins = mojo::Array<mojo::String>::From(allowed_origins.origins);
   info->configurations =
       mojo::Array<device::usb::WebUsbConfigurationSubsetPtr>::From(
-          set.configurations);
+          allowed_origins.configurations);
   return info;
 }
 
 // static
 device::usb::DeviceInfoPtr
 TypeConverter<device::usb::DeviceInfoPtr, device::UsbDevice>::Convert(
     const device::UsbDevice& device) {
   device::usb::DeviceInfoPtr info = device::usb::DeviceInfo::New();
   info->guid = device.guid();
   info->vendor_id = device.vendor_id();
   info->product_id = device.product_id();
   info->manufacturer_name = base::UTF16ToUTF8(device.manufacturer_string());
   info->product_name = base::UTF16ToUTF8(device.product_string());
   info->serial_number = base::UTF16ToUTF8(device.serial_number());
   info->configurations = mojo::Array<device::usb::ConfigurationInfoPtr>::From(
       device.configurations());
   if (device.webusb_allowed_origins()) {
     info->webusb_allowed_origins = device::usb::WebUsbDescriptorSet::From(
         *device.webusb_allowed_origins());
   }
   return info;
 }
 
 }  // namespace mojo