Remove service, add device, in BluetoothLocalGattService::Delegate

device/bluetooth/bluez/bluetooth_local_gatt_descriptor_bluez.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_BLUEZ_BLUETOOTH_LOCAL_GATT_DESCRIPTOR_BLUEZ_H_
 #define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_DESCRIPTOR_BLUEZ_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
@@ skipping 15 matching lines @@
   BluetoothLocalGattDescriptorBlueZ(
       const device::BluetoothUUID& uuid,
       device::BluetoothGattCharacteristic::Permissions permissions,
       BluetoothLocalGattCharacteristicBlueZ* characteristic);
   ~BluetoothLocalGattDescriptorBlueZ() override;
 
   // device::BluetoothLocalGattDescriptor overrides.
   device::BluetoothUUID GetUUID() const override;
   device::BluetoothGattCharacteristic::Permissions GetPermissions()
       const override;
-
-  BluetoothLocalGattCharacteristicBlueZ* GetCharacteristic() const;
+  device::BluetoothLocalGattCharacteristic* GetCharacteristic() const override;
 
  private:
   // Needs access to weak_ptr_factory_.
   friend class device::BluetoothLocalGattDescriptor;
 
   // UUID of this descriptor.
   device::BluetoothUUID uuid_;
 
   // Permissions of this descriptor.
   device::BluetoothGattCharacteristic::Permissions permissions_;
 
   // Characteristic that contains this descriptor.
   BluetoothLocalGattCharacteristicBlueZ* characteristic_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothLocalGattDescriptorBlueZ> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothLocalGattDescriptorBlueZ);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_DESCRIPTOR_BLUEZ_H_