Remove WebUSB descriptor data from device.mojom.

device/usb/mojo/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/usb/mojo/type_converters.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 194 matching lines @@
     Convert(const device::UsbConfigDescriptor& config) {
   device::usb::ConfigurationInfoPtr info =
       device::usb::ConfigurationInfo::New();
   info->configuration_value = config.configuration_value;
   info->interfaces =
       mojo::Array<device::usb::InterfaceInfoPtr>::From(config.interfaces);
   return info;
 }
 
 // static
-device::usb::WebUsbFunctionSubsetPtr TypeConverter<
-    device::usb::WebUsbFunctionSubsetPtr,
-    device::WebUsbFunctionSubset>::Convert(const device::WebUsbFunctionSubset&
-                                               function) {
-  device::usb::WebUsbFunctionSubsetPtr info =
-      device::usb::WebUsbFunctionSubset::New();
-  info->first_interface = function.first_interface;
-  info->origins = mojo::Array<mojo::String>::From(function.origins);
-  return info;
-}
-
-// static
-device::usb::WebUsbConfigurationSubsetPtr
-TypeConverter<device::usb::WebUsbConfigurationSubsetPtr,
-              device::WebUsbConfigurationSubset>::
-    Convert(const device::WebUsbConfigurationSubset& config) {
-  device::usb::WebUsbConfigurationSubsetPtr info =
-      device::usb::WebUsbConfigurationSubset::New();
-  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::WebUsbAllowedOrigins>::Convert(const device::WebUsbAllowedOrigins&
-                                               allowed_origins) {
-  device::usb::WebUsbDescriptorSetPtr info =
-      device::usb::WebUsbDescriptorSet::New();
-  info->origins = mojo::Array<mojo::String>::From(allowed_origins.origins);
-  info->configurations =
-      mojo::Array<device::usb::WebUsbConfigurationSubsetPtr>::From(
-          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());
   const device::UsbConfigDescriptor* config = device.GetActiveConfiguration();
   info->active_configuration = config ? config->configuration_value : 0;
   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;
 }
 
 // static
 device::usb::IsochronousPacketPtr
 TypeConverter<device::usb::IsochronousPacketPtr,
               device::UsbDeviceHandle::IsochronousPacket>::
     Convert(const device::UsbDeviceHandle::IsochronousPacket& packet) {
   device::usb::IsochronousPacketPtr info =
       device::usb::IsochronousPacket::New();
   info->length = packet.length;
   info->transferred_length = packet.transferred_length;
   info->status = mojo::ConvertTo<device::usb::TransferStatus>(packet.status);
   return info;
 }
 
 }  // namespace mojo