summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorscheib <scheib@chromium.org>2015-10-17 20:43:54 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-18 03:44:50 +0000
commitbc7f7ea4421a3a91012c174b96db4b3e5260c386 (patch)
tree5c701d1f6ceb155b780fc98d0d2fba58799fd23c /device
parent6adb8386f716ffe2bab1d2ceb03a000208b6dea7 (diff)
downloadchromium_src-bc7f7ea4421a3a91012c174b96db4b3e5260c386.zip
chromium_src-bc7f7ea4421a3a91012c174b96db4b3e5260c386.tar.gz
chromium_src-bc7f7ea4421a3a91012c174b96db4b3e5260c386.tar.bz2
bluetooth: mac: Fix incorrect use of AdvertisementData dictionary strings.
String values of the advertisementData dictionary key names [1] were used incorrectly instead of their values. [1] https://developer.apple.com/library/ios/documentation/CoreBluetooth/Reference/CBCentralManagerDelegate_Protocol BUG=541710 Review URL: https://codereview.chromium.org/1410223003 Cr-Commit-Position: refs/heads/master@{#354699}
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/bluetooth_adapter_mac_unittest.mm4
-rw-r--r--device/bluetooth/test/bluetooth_test_mac.mm8
2 files changed, 6 insertions, 6 deletions
diff --git a/device/bluetooth/bluetooth_adapter_mac_unittest.mm b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
index 34a2d2e..6329dd0 100644
--- a/device/bluetooth/bluetooth_adapter_mac_unittest.mm
+++ b/device/bluetooth/bluetooth_adapter_mac_unittest.mm
@@ -77,8 +77,8 @@ class BluetoothAdapterMacTest : public testing::Test {
NSDictionary* CreateAdvertisementData() {
NSDictionary* advertisement_data = @{
- @"CBAdvertisementDataIsConnectable" : @(YES),
- @"CBAdvertisementDataServiceDataKey" : [NSDictionary dictionary],
+ CBAdvertisementDataIsConnectable : @(YES),
+ CBAdvertisementDataServiceDataKey : [NSDictionary dictionary],
};
[advertisement_data retain];
return advertisement_data;
diff --git a/device/bluetooth/test/bluetooth_test_mac.mm b/device/bluetooth/test/bluetooth_test_mac.mm
index 744747b..0b02ff4 100644
--- a/device/bluetooth/test/bluetooth_test_mac.mm
+++ b/device/bluetooth/test/bluetooth_test_mac.mm
@@ -40,13 +40,13 @@ CBPeripheral* CreateMockPeripheral(NSString* peripheral_identifier) {
NSDictionary* CreateAdvertisementData(NSString* name, NSArray* uuids) {
NSMutableDictionary* advertisement_data =
[NSMutableDictionary dictionaryWithDictionary:@{
- @"CBAdvertisementDataLocalNameKey" : name,
- @"CBAdvertisementDataServiceDataKey" : [NSDictionary dictionary],
- @"CBAdvertisementDataIsConnectable" : @(YES),
+ CBAdvertisementDataLocalNameKey : name,
+ CBAdvertisementDataServiceDataKey : [NSDictionary dictionary],
+ CBAdvertisementDataIsConnectable : @(YES),
}];
if (uuids)
[advertisement_data setObject:uuids
- forKey:@"CBAdvertisementDataServiceUUIDsKey"];
+ forKey:CBAdvertisementDataServiceUUIDsKey];
return advertisement_data;
}