| Index: content/renderer/bluetooth/web_bluetooth_impl.cc
|
| diff --git a/content/renderer/bluetooth/web_bluetooth_impl.cc b/content/renderer/bluetooth/web_bluetooth_impl.cc
|
| index c518ef6720c4f7172be312ab724807fe63a2881d..c704eee187c9490adab66de8d717b067ee76fd0c 100644
|
| --- a/content/renderer/bluetooth/web_bluetooth_impl.cc
|
| +++ b/content/renderer/bluetooth/web_bluetooth_impl.cc
|
| @@ -101,7 +101,7 @@ void WebBluetoothImpl::getCharacteristics(
|
| DCHECK(blink::mojom::IsKnownEnumValue(
|
| static_cast<blink::mojom::WebBluetoothGATTQueryQuantity>(quantity)));
|
| GetWebBluetoothService().RemoteServiceGetCharacteristics(
|
| - mojo::String::From(service_instance_id),
|
| + service_instance_id.utf8(),
|
| static_cast<blink::mojom::WebBluetoothGATTQueryQuantity>(quantity),
|
| characteristics_uuid.isEmpty()
|
| ? base::nullopt
|
| @@ -116,7 +116,7 @@ void WebBluetoothImpl::readValue(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothReadValueCallbacks* callbacks) {
|
| GetWebBluetoothService().RemoteCharacteristicReadValue(
|
| - mojo::String::From(characteristic_instance_id),
|
| + characteristic_instance_id.utf8(),
|
| base::Bind(&WebBluetoothImpl::OnReadValueComplete, base::Unretained(this),
|
| base::Passed(base::WrapUnique(callbacks))));
|
| }
|
| @@ -126,8 +126,7 @@ void WebBluetoothImpl::writeValue(
|
| const blink::WebVector<uint8_t>& value,
|
| blink::WebBluetoothWriteValueCallbacks* callbacks) {
|
| GetWebBluetoothService().RemoteCharacteristicWriteValue(
|
| - mojo::String::From(characteristic_instance_id),
|
| - mojo::Array<uint8_t>::From(value),
|
| + characteristic_instance_id.utf8(), mojo::Array<uint8_t>::From(value),
|
| base::Bind(&WebBluetoothImpl::OnWriteValueComplete,
|
| base::Unretained(this), value,
|
| base::Passed(base::WrapUnique(callbacks))));
|
| @@ -137,7 +136,7 @@ void WebBluetoothImpl::startNotifications(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothNotificationsCallbacks* callbacks) {
|
| GetWebBluetoothService().RemoteCharacteristicStartNotifications(
|
| - mojo::String::From(characteristic_instance_id),
|
| + characteristic_instance_id.utf8(),
|
| base::Bind(&WebBluetoothImpl::OnStartNotificationsComplete,
|
| base::Unretained(this),
|
| base::Passed(base::WrapUnique(callbacks))));
|
| @@ -147,7 +146,7 @@ void WebBluetoothImpl::stopNotifications(
|
| const blink::WebString& characteristic_instance_id,
|
| blink::WebBluetoothNotificationsCallbacks* callbacks) {
|
| GetWebBluetoothService().RemoteCharacteristicStopNotifications(
|
| - mojo::String::From(characteristic_instance_id),
|
| + characteristic_instance_id.utf8(),
|
| base::Bind(&WebBluetoothImpl::OnStopNotificationsComplete,
|
| base::Unretained(this),
|
| base::Passed(base::WrapUnique(callbacks))));
|
|
|