bluetooth: Refactor how we update based on Advertising Data

device/bluetooth/test/bluetooth_test_mac.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/test/bluetooth_test_mac.h"
 
 #include <stdint.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 39 matching lines @@
   MockCentralManager* get() { return mock_central_manager_.get(); };
 
  private:
   scoped_nsobject<MockCentralManager> mock_central_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedMockCentralManager);
 };
 
 namespace {
 
-scoped_nsobject<NSDictionary> CreateAdvertisementData(NSString* name,
-                                                      NSArray* uuids) {
+scoped_nsobject<NSDictionary> CreateAdvertisementData(
+    NSString* name,
+    NSArray* uuids,
+    NSDictionary* service_data) {
   NSMutableDictionary* advertisement_data(
       [NSMutableDictionary dictionaryWithDictionary:@{
-        CBAdvertisementDataServiceDataKey : @{},
-        CBAdvertisementDataIsConnectable : @(YES),
+        CBAdvertisementDataIsConnectable : @(YES)
       }]);
+
   if (name) {
     [advertisement_data setObject:name forKey:CBAdvertisementDataLocalNameKey];
   }
+
   if (uuids) {
     [advertisement_data setObject:uuids
                            forKey:CBAdvertisementDataServiceUUIDsKey];
   }
+
+  if (service_data) {
+    [advertisement_data setObject:service_data
+                           forKey:CBAdvertisementDataServiceDataKey];
+  }
+
   return scoped_nsobject<NSDictionary>(advertisement_data,
                                        base::scoped_policy::RETAIN);
 }
 
 }  // namespace
 
 // UUID1 hashes to kTestDeviceAddress1, and UUID2 to kTestDeviceAddress2.
 const std::string BluetoothTestMac::kTestPeripheralUUID1 =
     "34045B00-0000-0000-0000-000000000000";
 const std::string BluetoothTestMac::kTestPeripheralUUID2 =
@@ skipping 47 matching lines @@
 
 BluetoothDevice* BluetoothTestMac::SimulateLowEnergyDevice(int device_ordinal) {
   TestBluetoothAdapterObserver observer(adapter_);
   CBCentralManager* central_manager = adapter_mac_->low_energy_central_manager_;
   BluetoothLowEnergyCentralManagerDelegate* central_manager_delegate =
       adapter_mac_->low_energy_central_manager_delegate_;
 
   const char* identifier;
   NSString* name;
   NSArray* uuids;
+  NSDictionary* service_data;
 
   switch (device_ordinal) {
     case 1:
       identifier = kTestPeripheralUUID1.c_str();
       name = @(kTestDeviceName.c_str());
       uuids = @[
         [CBUUID UUIDWithString:@(kTestUUIDGenericAccess.c_str())],
         [CBUUID UUIDWithString:@(kTestUUIDGenericAttribute.c_str())]
       ];
+      service_data = @{
+        [CBUUID UUIDWithString:@(kTestUUIDHeartRate.c_str())] :
+            [NSData dataWithBytes:(unsigned char[]){1} length:1]
+      };
       break;
     case 2:
       identifier = kTestPeripheralUUID1.c_str();
       name = @(kTestDeviceName.c_str());
       uuids = @[
         [CBUUID UUIDWithString:@(kTestUUIDImmediateAlert.c_str())],
         [CBUUID UUIDWithString:@(kTestUUIDLinkLoss.c_str())]
       ];
+      service_data = @{
+        [CBUUID UUIDWithString:@(kTestUUIDHeartRate.c_str())] :
+            [NSData dataWithBytes:(unsigned char[]){2} length:1],
+        [CBUUID UUIDWithString:@(kTestUUIDImmediateAlert.c_str())] :
+            [NSData dataWithBytes:(unsigned char[]){0} length:1]
+      };
       break;
     case 3:
       identifier = kTestPeripheralUUID1.c_str();
       name = @(kTestDeviceNameEmpty.c_str());
       uuids = nil;
+      service_data = nil;
       break;
     case 4:
       identifier = kTestPeripheralUUID2.c_str();
       name = @(kTestDeviceNameEmpty.c_str());
       uuids = nil;
+      service_data = nil;
       break;
     case 5:
       identifier = kTestPeripheralUUID1.c_str();
       name = nil;
       uuids = nil;
+      service_data = nil;
       break;
     default:
       NOTREACHED() << "SimulateLowEnergyDevice not implemented for "
                    << device_ordinal;
       identifier = nil;
       name = nil;
       uuids = nil;
+      service_data = nil;
   }
   scoped_nsobject<MockCBPeripheral> mock_peripheral([[MockCBPeripheral alloc]
       initWithUTF8StringIdentifier:identifier
                               name:name]);
   mock_peripheral.get().bluetoothTestMac = this;
-  [central_manager_delegate centralManager:central_manager
-                     didDiscoverPeripheral:mock_peripheral.get().peripheral
-                         advertisementData:CreateAdvertisementData(name, uuids)
-                                      RSSI:@(0)];
+  [central_manager_delegate
+             centralManager:central_manager
+      didDiscoverPeripheral:mock_peripheral.get().peripheral
+          advertisementData:CreateAdvertisementData(name, uuids, service_data)
+                       RSSI:@(0)];
   return observer.last_device();
 }
 
 void BluetoothTestMac::SimulateGattConnection(BluetoothDevice* device) {
   BluetoothLowEnergyDeviceMac* lowEnergyDeviceMac =
       static_cast<BluetoothLowEnergyDeviceMac*>(device);
   CBPeripheral* peripheral = lowEnergyDeviceMac->GetPeripheral();
   MockCBPeripheral* mockPeripheral = (MockCBPeripheral*)peripheral;
   [mockPeripheral setState:CBPeripheralStateConnected];
   CBCentralManager* centralManager =
@@ skipping 243 matching lines @@
 //     crypto::SHA256HashString(input_str, raw, sizeof(raw));
 //     if (base::HexEncode(raw, sizeof(raw)) == target) {
 //       return input_str;
 //     }
 //     ++input[0];
 //   }
 //   return "";
 // }
 
 }  // namespace device