bluetooth: macOS: Removing intermediate methods in BluetoothRemoteServiceMac

device/bluetooth/bluetooth_low_energy_device_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/bluetooth_low_energy_device_mac.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 #include <stddef.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 291 matching lines @@
   }
   device_uuids_.ClearServiceUUIDs();
   SetGattServicesDiscoveryComplete(false);
   adapter_->NotifyDeviceChanged(this);
   DiscoverPrimaryServices();
 }
 
 void BluetoothLowEnergyDeviceMac::DidUpdateValue(
     CBCharacteristic* characteristic,
     NSError* error) {
-  BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattServiceMac(characteristic.service);
-  DCHECK(gatt_service);
-  gatt_service->DidUpdateValue(characteristic, error);
+  BluetoothRemoteGattCharacteristicMac* gatt_characteristic_mac =
+      GetBluetoothRemoteGattCharacteristicMac(characteristic);
+  DCHECK(gatt_characteristic_mac);
+  gatt_characteristic_mac->DidUpdateValue(error);
 }
 
 void BluetoothLowEnergyDeviceMac::DidWriteValue(
     CBCharacteristic* characteristic,
     NSError* error) {
-  BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattServiceMac(characteristic.service);
-  DCHECK(gatt_service);
-  gatt_service->DidWriteValue(characteristic, error);
+  BluetoothRemoteGattCharacteristicMac* gatt_characteristic_mac =
+      GetBluetoothRemoteGattCharacteristicMac(characteristic);
+  DCHECK(gatt_characteristic_mac);
+  gatt_characteristic_mac->DidWriteValue(error);
 }
 
 void BluetoothLowEnergyDeviceMac::DidUpdateNotificationState(
     CBCharacteristic* characteristic,
     NSError* error) {
-  BluetoothRemoteGattServiceMac* gatt_service =
-      GetBluetoothRemoteGattServiceMac(characteristic.service);
-  DCHECK(gatt_service);
-  gatt_service->DidUpdateNotificationState(characteristic, error);
+  BluetoothRemoteGattCharacteristicMac* gatt_characteristic_mac =
+      GetBluetoothRemoteGattCharacteristicMac(characteristic);
+  DCHECK(gatt_characteristic_mac);
+  gatt_characteristic_mac->DidUpdateNotificationState(error);
 }
 
 void BluetoothLowEnergyDeviceMac::DidDiscoverDescriptors(
     CBCharacteristic* cb_characteristic,
     NSError* error) {
   if (error) {
     // TODO(http://crbug.com/609320): Need to pass the error.
     // TODO(http://crbug.com/609844): Decide what to do if discover failed
     VLOG(1) << *this << ": Can't discover descriptors: "
             << BluetoothAdapterMac::String(error);
@@ skipping 112 matching lines @@
   for (auto it = gatt_services_.begin(); it != gatt_services_.end(); ++it) {
     device::BluetoothRemoteGattService* gatt_service = it->second.get();
     device::BluetoothRemoteGattServiceMac* gatt_service_mac =
         static_cast<BluetoothRemoteGattServiceMac*>(gatt_service);
     if (gatt_service_mac->GetService() == cb_service)
       return gatt_service_mac;
   }
   return nullptr;
 }
 
+device::BluetoothRemoteGattCharacteristicMac*
+BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattCharacteristicMac(
+    CBCharacteristic* cb_characteristic) const {
+  CBService* cb_service = [cb_characteristic service];
+  device::BluetoothRemoteGattServiceMac* gatt_service_mac =
+      GetBluetoothRemoteGattServiceMac(cb_service);
+  if (!gatt_service_mac) {
+    return nullptr;
+  }
+  return gatt_service_mac->GetBluetoothRemoteGattCharacteristicMac(
+      cb_characteristic);
+}
+
 device::BluetoothRemoteGattDescriptorMac*
 BluetoothLowEnergyDeviceMac::GetBluetoothRemoteGattDescriptorMac(
     CBDescriptor* cb_descriptor) const {
   CBCharacteristic* cb_characteristic = cb_descriptor.characteristic;
   device::BluetoothRemoteGattServiceMac* gatt_service =
       GetBluetoothRemoteGattServiceMac(cb_characteristic.service);
   DCHECK(gatt_service);
   device::BluetoothRemoteGattCharacteristicMac* gatt_characteristic =
       gatt_service->GetBluetoothRemoteGattCharacteristicMac(cb_characteristic);
   DCHECK(gatt_characteristic);
@@ skipping 36 matching lines @@
   // TODO(crbug.com/703878): Should use
   // BluetoothLowEnergyDeviceMac::GetNameForDisplay() instead.
   base::Optional<std::string> name = device.GetName();
   const char* is_gatt_connected =
       device.IsGattConnected() ? "GATT connected" : "GATT disconnected";
   return out << "<BluetoothLowEnergyDeviceMac " << device.GetAddress() << "/"
              << &device << ", " << is_gatt_connected << ", \""
              << name.value_or("Unnamed device") << "\">";
 }
 }  // namespace device