bluetooth: macOS: Adding Mac suffix

Adding Mac suffix to the following methods to keep consistency: BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattService() BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattDescriptor() BUG=727020 Review-Url: https://codereview.chromium.org/2912603002 Cr-Commit-Position: refs/heads/master@{#475397}
marcosholgado · May 30, 2017 · 78a4bf7 · 78a4bf7
1 parent a0ec2bf
commit 78a4bf7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/device/bluetooth/bluetooth_low_energy_device_mac.h b/device/bluetooth/bluetooth_low_energy_device_mac.h
@@ -129,11 +129,11 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
   CBPeripheral* GetPeripheral();
 
   // Returns BluetoothRemoteGattServiceMac based on the CBService.
-  BluetoothRemoteGattServiceMac* GetBluetoothRemoteGattService(
+  BluetoothRemoteGattServiceMac* GetBluetoothRemoteGattServiceMac(
       CBService* service) const;
 
   // Returns BluetoothRemoteGattDescriptorMac based on the CBDescriptor.
-  BluetoothRemoteGattDescriptorMac* GetBluetoothRemoteGattDescriptor(
+  BluetoothRemoteGattDescriptorMac* GetBluetoothRemoteGattDescriptorMac(
       CBDescriptor* cb_descriptor) const;
 
   // Callback used when the CoreBluetooth Peripheral is disconnected.

diff --git a/device/bluetooth/bluetooth_low_energy_device_mac.mm b/device/bluetooth/bluetooth_low_energy_device_mac.mm
@@ -230,7 +230,7 @@
 
   for (CBService* cb_service in GetPeripheral().services) {
     BluetoothRemoteGattServiceMac* gatt_service =
-        GetBluetoothRemoteGattService(cb_service);
+        GetBluetoothRemoteGattServiceMac(cb_service);
     if (!gatt_service) {
       gatt_service = new BluetoothRemoteGattServiceMac(this, cb_service,
                                                        true /* is_primary */);
@@ -279,7 +279,7 @@
   }
 
   BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattService(cb_service);
+      GetBluetoothRemoteGattServiceMac(cb_service);
   DCHECK(gatt_service);
   gatt_service->DidDiscoverCharacteristics();
   SendNotificationIfDiscoveryComplete();
@@ -292,7 +292,7 @@
           << base::SysNSStringToUTF8([invalidatedServices description]);
   for (CBService* cb_service in invalidatedServices) {
     BluetoothRemoteGattServiceMac* gatt_service =
-        GetBluetoothRemoteGattService(cb_service);
+        GetBluetoothRemoteGattServiceMac(cb_service);
     DCHECK(gatt_service);
     VLOG(1) << gatt_service->GetUUID().canonical_value();
     std::unique_ptr<BluetoothRemoteGattService> scoped_service =
@@ -310,7 +310,7 @@
     CBCharacteristic* characteristic,
     NSError* error) {
   BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattService(characteristic.service);
+      GetBluetoothRemoteGattServiceMac(characteristic.service);
   DCHECK(gatt_service);
   gatt_service->DidUpdateValue(characteristic, error);
 }
@@ -319,7 +319,7 @@
     CBCharacteristic* characteristic,
     NSError* error) {
   BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattService(characteristic.service);
+      GetBluetoothRemoteGattServiceMac(characteristic.service);
   DCHECK(gatt_service);
   gatt_service->DidWriteValue(characteristic, error);
 }
@@ -328,7 +328,7 @@
     CBCharacteristic* characteristic,
     NSError* error) {
   BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattService(characteristic.service);
+      GetBluetoothRemoteGattServiceMac(characteristic.service);
   DCHECK(gatt_service);
   gatt_service->DidUpdateNotificationState(characteristic, error);
 }
@@ -356,7 +356,7 @@
     return;
   }
   BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattService(cb_characteristic.service);
+      GetBluetoothRemoteGattServiceMac(cb_characteristic.service);
   DCHECK(gatt_service);
   gatt_service->DidDiscoverDescriptors(cb_characteristic);
   SendNotificationIfDiscoveryComplete();
@@ -366,7 +366,7 @@
     CBDescriptor* cb_descriptor,
     NSError* error) {
   BluetoothRemoteGattDescriptorMac* gatt_descriptor =
-      GetBluetoothRemoteGattDescriptor(cb_descriptor);
+      GetBluetoothRemoteGattDescriptorMac(cb_descriptor);
   DCHECK(gatt_descriptor);
   gatt_descriptor->DidUpdateValueForDescriptor(error);
 }
@@ -375,7 +375,7 @@
     CBDescriptor* cb_descriptor,
     NSError* error) {
   BluetoothRemoteGattDescriptorMac* gatt_descriptor =
-      GetBluetoothRemoteGattDescriptor(cb_descriptor);
+      GetBluetoothRemoteGattDescriptorMac(cb_descriptor);
   DCHECK(gatt_descriptor);
   gatt_descriptor->DidWriteValueForDescriptor(error);
 }
@@ -451,7 +451,7 @@
 }
 
 device::BluetoothRemoteGattServiceMac*
-BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattService(
+BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattServiceMac(
     CBService* cb_service) const {
   for (auto it = gatt_services_.begin(); it != gatt_services_.end(); ++it) {
     device::BluetoothRemoteGattService* gatt_service = it->second.get();
@@ -464,11 +464,11 @@
 }
 
 device::BluetoothRemoteGattDescriptorMac*
-BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattDescriptor(
+BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattDescriptorMac(
     CBDescriptor* cb_descriptor) const {
   CBCharacteristic* cb_characteristic = cb_descriptor.characteristic;
   device::BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattService(cb_characteristic.service);
+      GetBluetoothRemoteGattServiceMac(cb_characteristic.service);
   DCHECK(gatt_service);
   device::BluetoothRemoteGattCharacteristicMac* gatt_characteristic =
       gatt_service->GetBluetoothRemoteGattCharacteristicMac(cb_characteristic);