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 1cf1d1838cf7e6c26e80b915afbc2ab6222bf371..0a27de208d17045aa440958e7813da728eb26ab5 100644 |
--- a/device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm |
+++ b/device/bluetooth/test/mock_bluetooth_cbcharacteristic_mac.mm |
@@ -94,8 +94,7 @@ CBCharacteristicProperties GattCharacteristicPropertyToCBCharacteristicProperty( |
CBService* _service; |
scoped_nsobject<CBUUID> _UUID; |
CBCharacteristicProperties _cb_properties; |
- scoped_nsobject<NSMutableArray> _simulatedDescriptors; |
- scoped_nsobject<NSArray> _descriptors; |
+ scoped_nsobject<NSMutableArray> _descriptors; |
scoped_nsobject<NSObject> _value; |
BOOL _notifying; |
} |
@@ -113,7 +112,7 @@ CBCharacteristicProperties GattCharacteristicPropertyToCBCharacteristicProperty( |
_cb_properties = |
device::GattCharacteristicPropertyToCBCharacteristicProperty( |
properties); |
- _simulatedDescriptors.reset([[NSMutableArray alloc] init]); |
+ _descriptors.reset([[NSMutableArray alloc] init]); |
} |
return self; |
} |
@@ -189,15 +188,11 @@ CBCharacteristicProperties GattCharacteristicPropertyToCBCharacteristicProperty( |
error:nil]; |
} |
-- (void)simulateDescriptorWithUUID:(CBUUID*)uuid { |
+- (void)addDescriptorWithUUID:(CBUUID*)uuid { |
scoped_nsobject<MockCBDescriptor> descriptor_mock([[MockCBDescriptor alloc] |
initWithCharacteristic:self.characteristic |
CBUUID:uuid]); |
- [_simulatedDescriptors.get() addObject:descriptor_mock]; |
-} |
- |
-- (void)discoverDescriptors { |
- _descriptors.reset([_simulatedDescriptors copy]); |
+ [_descriptors.get() addObject:descriptor_mock]; |
} |
- (CBUUID*)UUID { |