| Index: content/renderer/bluetooth/bluetooth_type_converters.cc
|
| diff --git a/content/renderer/bluetooth/bluetooth_type_converters.cc b/content/renderer/bluetooth/bluetooth_type_converters.cc
|
| index 863e2ef859d6eb10ca430e5e8cc3580b40a83317..d695894cd73c4a101adc4ace6eb2c728167791ab 100644
|
| --- a/content/renderer/bluetooth/bluetooth_type_converters.cc
|
| +++ b/content/renderer/bluetooth/bluetooth_type_converters.cc
|
| @@ -16,8 +16,10 @@ blink::mojom::WebBluetoothScanFilterPtr TypeConverter<
|
| web_filter) {
|
| blink::mojom::WebBluetoothScanFilterPtr filter =
|
| blink::mojom::WebBluetoothScanFilter::New();
|
| +
|
| if (!web_filter.services.isEmpty())
|
| - filter->services = Array<String>::From(web_filter.services);
|
| + filter->services =
|
| + Array<base::Optional<device::BluetoothUUID>>::From(web_filter.services);
|
|
|
| if (web_filter.hasName)
|
| filter->name = String::From(web_filter.name);
|
| @@ -27,6 +29,7 @@ blink::mojom::WebBluetoothScanFilterPtr TypeConverter<
|
| return filter;
|
| }
|
|
|
| +// static
|
| blink::mojom::WebBluetoothRequestDeviceOptionsPtr
|
| TypeConverter<blink::mojom::WebBluetoothRequestDeviceOptionsPtr,
|
| blink::WebRequestDeviceOptions>::
|
| @@ -37,8 +40,16 @@ TypeConverter<blink::mojom::WebBluetoothRequestDeviceOptionsPtr,
|
| options->filters = mojo::Array<blink::mojom::WebBluetoothScanFilterPtr>::From(
|
| web_options.filters);
|
| options->optional_services =
|
| - mojo::Array<mojo::String>::From(web_options.optionalServices);
|
| + mojo::Array<base::Optional<device::BluetoothUUID>>::From(
|
| + web_options.optionalServices);
|
| return options;
|
| }
|
|
|
| +// static
|
| +base::Optional<device::BluetoothUUID>
|
| +TypeConverter<base::Optional<device::BluetoothUUID>, blink::WebString>::Convert(
|
| + const blink::WebString& web_string) {
|
| + return base::make_optional(device::BluetoothUUID(web_string.utf8()));
|
| +}
|
| +
|
| } // namespace mojo
|
|
|