Bluetooth: macOS: Making code to get mac descriptors more coherent

device/bluetooth/bluetooth_remote_gatt_service_mac.h

 // Copyright 2016 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_MAC_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_MAC_H_
 
 #include <stdint.h>
 
 #include <unordered_map>
 #include <vector>
 
 #include "base/mac/scoped_nsobject.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 
 @class CBCharacteristic;
+@class CBDescriptor;
 @class CBPeripheral;
 @class CBService;
 
 namespace device {
 
 class BluetoothAdapterMac;
 class BluetoothDevice;
 class BluetoothRemoteGattCharacteristicMac;
+class BluetoothRemoteGattDescriptorMac;
 class BluetoothLowEnergyDeviceMac;
 
 class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceMac
     : public BluetoothRemoteGattService {
  public:
   BluetoothRemoteGattServiceMac(
       BluetoothLowEnergyDeviceMac* bluetooth_device_mac,
       CBService* service,
       bool is_primary);
   ~BluetoothRemoteGattServiceMac() override;
@@ skipping 29 matching lines @@
   bool IsDiscoveryComplete() const;
 
   // Returns the mac adapter.
   BluetoothAdapterMac* GetMacAdapter() const;
   // Returns CBPeripheral.
   CBPeripheral* GetCBPeripheral() const;
   // Returns CBService.
   CBService* GetService() const;
   // Returns a remote characteristic based on the CBCharacteristic.
   BluetoothRemoteGattCharacteristicMac* GetBluetoothRemoteGattCharacteristicMac(
-      CBCharacteristic* characteristic) const;
+      CBCharacteristic* cb_characteristic) const;
+  // Returns a remote descriptor based on the CBDescriptor.
+  BluetoothRemoteGattDescriptorMac* GetBluetoothRemoteGattDescriptorMac(
+      CBDescriptor* cb_descriptor) const;
 
   // bluetooth_device_mac_ owns instances of this class.
   BluetoothLowEnergyDeviceMac* bluetooth_device_mac_;
   // A service from CBPeripheral.services.
   base::scoped_nsobject<CBService> service_;
   // Map of characteristics, keyed by characteristic identifier.
   std::unordered_map<std::string,
                      std::unique_ptr<BluetoothRemoteGattCharacteristicMac>>
       gatt_characteristic_macs_;
   bool is_primary_;
@@ skipping 12 matching lines @@
 };
 
 // Stream operator for logging.
 DEVICE_BLUETOOTH_EXPORT std::ostream& operator<<(
     std::ostream& out,
     const BluetoothRemoteGattServiceMac& service);
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_MAC_H_