| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| index 67c4c46a0808cccf6c6d1390c259795d762c0e98..92d7847cbce849c9eb856e22f3737c560f0e3624 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
|
| @@ -210,9 +210,9 @@ void BluetoothRemoteGattCharacteristicMac::SubscribeToNotifications(
|
| BluetoothRemoteGattDescriptor* ccc_descriptor,
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback) {
|
| - DCHECK(subscribe_to_notification_callback_.first.is_null());
|
| - DCHECK(subscribe_to_notification_callback_.second.is_null());
|
| - subscribe_to_notification_callback_ =
|
| + DCHECK(subscribe_to_notification_callbacks_.first.is_null());
|
| + DCHECK(subscribe_to_notification_callbacks_.second.is_null());
|
| + subscribe_to_notification_callbacks_ =
|
| std::make_pair(callback, error_callback);
|
| [GetCBPeripheral() setNotifyValue:YES
|
| forCharacteristic:cb_characteristic_.get()];
|
| @@ -294,8 +294,8 @@ void BluetoothRemoteGattCharacteristicMac::DidWriteValue(NSError* error) {
|
|
|
| void BluetoothRemoteGattCharacteristicMac::DidUpdateNotificationState(
|
| NSError* error) {
|
| - PendingNotifyCallback reentrant_safe_callbacks;
|
| - reentrant_safe_callbacks.swap(subscribe_to_notification_callback_);
|
| + PendingNotifyCallbacks reentrant_safe_callbacks;
|
| + reentrant_safe_callbacks.swap(subscribe_to_notification_callbacks_);
|
| if (error) {
|
| VLOG(1) << "Bluetooth error while modifying notification state for "
|
| "characteristic, domain: "
|
|
|