Remove WebUSB descriptor data from device.mojom.

device/usb/mojo/type_converters.cc

Index: device/usb/mojo/type_converters.cc
diff --git a/device/usb/mojo/type_converters.cc b/device/usb/mojo/type_converters.cc
index 1761f0a4daecd8f391e493ce5132406bb725d960..8e6d352c018c41727ca983bc924bb1a0ca8b30af 100644
--- a/device/usb/mojo/type_converters.cc
+++ b/device/usb/mojo/type_converters.cc
@@ -212,46 +212,6 @@ TypeConverter<device::usb::ConfigurationInfoPtr, device::UsbConfigDescriptor>::
 }
 
 // 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) {
@@ -266,10 +226,6 @@ TypeConverter<device::usb::DeviceInfoPtr, device::UsbDevice>::Convert(
   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;
 }