| Index: device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
|
| diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
|
| index ba57f3027583c788cbd559d4938aa6eecd7df8be..f6a1971eb5dfb43c92bcfc616f3a05622afb1866 100644
|
| --- a/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
|
| +++ b/device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_service_provider.h
|
| @@ -6,7 +6,6 @@
|
| #define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
|
|
| #include <stdint.h>
|
| -#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -15,7 +14,7 @@
|
| #include "dbus/object_path.h"
|
| #include "device/bluetooth/bluetooth_export.h"
|
| #include "device/bluetooth/bluetooth_local_gatt_service.h"
|
| -#include "device/bluetooth/dbus/bluetooth_gatt_attribute_value_delegate.h"
|
| +#include "device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h"
|
| #include "device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.h"
|
|
|
| namespace bluez {
|
| @@ -35,9 +34,7 @@
|
| ~FakeBluetoothGattCharacteristicServiceProvider() override;
|
|
|
| // BluetoothGattCharacteristicServiceProvider override.
|
| - void SendValueChanged(const dbus::ObjectPath& device_path,
|
| - const std::vector<uint8_t>& value,
|
| - bool indicate) override;
|
| + void SendValueChanged(const std::vector<uint8_t>& value) override;
|
|
|
| // Methods to simulate value get/set requests issued from a remote device. The
|
| // methods do nothing, if the associated service was not registered with the
|
| @@ -61,9 +58,7 @@
|
| const dbus::ObjectPath& object_path() const override;
|
| const std::string& uuid() const { return uuid_; }
|
| const dbus::ObjectPath& service_path() const { return service_path_; }
|
| - const dbus::ObjectPath& last_device_path() const { return last_device_path_; }
|
| - const std::vector<uint8_t>& last_value() const { return last_value_; }
|
| - const bool& last_indicate_flag() const { return last_indicate_flag_; }
|
| + const std::vector<uint8_t>& sent_value() const { return sent_value_; }
|
|
|
| private:
|
| // D-Bus object path of the fake GATT characteristic.
|
| @@ -78,12 +73,8 @@
|
| // Object path of the service that this characteristic belongs to.
|
| const dbus::ObjectPath service_path_;
|
|
|
| - // Last device that sent a value.
|
| - dbus::ObjectPath last_device_path_;
|
| - // Last value that was sent to the fake remote device.
|
| - std::vector<uint8_t> last_value_;
|
| - // Last value of the indicate flag used when sending a notification.
|
| - bool last_indicate_flag_;
|
| + // Value that was sent to the fake remote device.
|
| + std::vector<uint8_t> sent_value_;
|
|
|
| // The delegate that method calls are passed on to.
|
| std::unique_ptr<BluetoothGattAttributeValueDelegate> delegate_;
|
|
|