Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm

Issue 2767813002: Bluetooth: macOS: Implementing read/write for descriptors (Closed)
Patch Set: . Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm
diff --git a/device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm b/device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm
index 2cc9eb7be148850b3e66989560e7438f8e7aa607..1cf1d1838cf7e6c26e80b915afbc2ab6222bf371 100644
--- a/device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm
+++ b/device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm
@@ -96,7 +96,7 @@ CBCharacteristicProperties GattCharacteristicPropertyToCBCharacteristicProperty(
CBCharacteristicProperties _cb_properties;
scoped_nsobject<NSMutableArray> _simulatedDescriptors;
scoped_nsobject<NSArray> _descriptors;
- scoped_nsobject<NSData> _value;
+ scoped_nsobject<NSObject> _value;
BOOL _notifying;
}
@end
@@ -134,7 +134,7 @@ CBCharacteristicProperties GattCharacteristicPropertyToCBCharacteristicProperty(
return [super isKindOfClass:aClass];
}
-- (void)simulateReadWithValue:(NSData*)value error:(NSError*)error {
+- (void)simulateReadWithValue:(id)value error:(NSError*)error {
_value.reset([value copy]);
CBPeripheral* peripheral = _service.peripheral;
[peripheral.delegate peripheral:peripheral
@@ -220,7 +220,7 @@ CBCharacteristicProperties GattCharacteristicPropertyToCBCharacteristicProperty(
return _descriptors;
}
-- (NSData*)value {
+- (id)value {
return _value.get();
}
« no previous file with comments | « device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.h ('k') | device/bluetooth/test/mock_bluetooth_cbdescriptor_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698