| Index: third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| index 8ea588a45fcb16d70fe42d70e1d46e1722ac5d0d..1b0fb018f266833611f3172f284a5233319679ab 100644
|
| --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| @@ -46,13 +46,12 @@ mojom::blink::WebBluetoothDeviceIdPtr BluetoothDevice::createMojoDeviceId(
|
| return result;
|
| }
|
|
|
| -BluetoothRemoteGATTService*
|
| -BluetoothDevice::getOrCreateBluetoothRemoteGATTService(
|
| +BluetoothRemoteGATTService* BluetoothDevice::getOrCreateRemoteGATTService(
|
| const String& serviceInstanceId,
|
| const String& uuid,
|
| bool isPrimary,
|
| const String& deviceInstanceId) {
|
| - return m_attributeInstanceMap->getOrCreateBluetoothRemoteGATTService(
|
| + return m_attributeInstanceMap->getOrCreateRemoteGATTService(
|
| serviceInstanceId, uuid, isPrimary, deviceInstanceId);
|
| }
|
|
|
| @@ -61,14 +60,14 @@ bool BluetoothDevice::isValidService(const String& serviceInstanceId) {
|
| }
|
|
|
| BluetoothRemoteGATTCharacteristic*
|
| -BluetoothDevice::getOrCreateBluetoothRemoteGATTCharacteristic(
|
| +BluetoothDevice::getOrCreateRemoteGATTCharacteristic(
|
| ExecutionContext* context,
|
| const String& characteristicInstanceId,
|
| const String& serviceInstanceId,
|
| const String& uuid,
|
| uint32_t characteristicProperties,
|
| BluetoothRemoteGATTService* service) {
|
| - return m_attributeInstanceMap->getOrCreateBluetoothRemoteGATTCharacteristic(
|
| + return m_attributeInstanceMap->getOrCreateRemoteGATTCharacteristic(
|
| context, characteristicInstanceId, serviceInstanceId, uuid,
|
| characteristicProperties, service);
|
| }
|
|
|