Index: device/bluetooth/test/mock_bluetooth_gatt_characteristic.h |
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h |
index dc1a9bb0328e3def25ee9b976ab96441c01a1dd8..7ffec2cab29477ac6005d3d7dc563ea5d2493715 100644 |
--- a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h |
+++ b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h |
@@ -12,17 +12,18 @@ |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "device/bluetooth/bluetooth_gatt_characteristic.h" |
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h" |
#include "device/bluetooth/bluetooth_uuid.h" |
#include "testing/gmock/include/gmock/gmock.h" |
namespace device { |
-class BluetoothGattDescriptor; |
-class BluetoothGattService; |
+class BluetoothRemoteGattDescriptor; |
+class BluetoothRemoteGattService; |
class MockBluetoothGattService; |
-class MockBluetoothGattCharacteristic : public BluetoothGattCharacteristic { |
+class MockBluetoothGattCharacteristic |
+ : public BluetoothRemoteGattCharacteristic { |
public: |
MockBluetoothGattCharacteristic(MockBluetoothGattService* service, |
const std::string& identifier, |
@@ -36,14 +37,15 @@ class MockBluetoothGattCharacteristic : public BluetoothGattCharacteristic { |
MOCK_CONST_METHOD0(GetUUID, BluetoothUUID()); |
MOCK_CONST_METHOD0(IsLocal, bool()); |
MOCK_CONST_METHOD0(GetValue, const std::vector<uint8_t>&()); |
- MOCK_CONST_METHOD0(GetService, BluetoothGattService*()); |
+ MOCK_CONST_METHOD0(GetService, BluetoothRemoteGattService*()); |
MOCK_CONST_METHOD0(GetProperties, Properties()); |
MOCK_CONST_METHOD0(GetPermissions, Permissions()); |
MOCK_CONST_METHOD0(IsNotifying, bool()); |
- MOCK_CONST_METHOD0(GetDescriptors, std::vector<BluetoothGattDescriptor*>()); |
+ MOCK_CONST_METHOD0(GetDescriptors, |
+ std::vector<BluetoothRemoteGattDescriptor*>()); |
MOCK_CONST_METHOD1(GetDescriptor, |
- BluetoothGattDescriptor*(const std::string&)); |
- MOCK_METHOD1(AddDescriptor, bool(BluetoothGattDescriptor*)); |
+ BluetoothRemoteGattDescriptor*(const std::string&)); |
+ MOCK_METHOD1(AddDescriptor, bool(BluetoothRemoteGattDescriptor*)); |
MOCK_METHOD1(UpdateValue, bool(const std::vector<uint8_t>&)); |
MOCK_METHOD2(StartNotifySession, |
void(const NotifySessionCallback&, const ErrorCallback&)); |