| Index: device/bluetooth/test/mock_bluetooth_gatt_service.h
|
| diff --git a/device/bluetooth/test/mock_bluetooth_gatt_service.h b/device/bluetooth/test/mock_bluetooth_gatt_service.h
|
| index a2430d5a7191d7b77eff911d3a8cfd40f8fe086a..4e4460dab0853554ab70df414db5c20e9ce88b28 100644
|
| --- a/device/bluetooth/test/mock_bluetooth_gatt_service.h
|
| +++ b/device/bluetooth/test/mock_bluetooth_gatt_service.h
|
| @@ -11,17 +11,17 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_vector.h"
|
| -#include "device/bluetooth/bluetooth_gatt_service.h"
|
| +#include "device/bluetooth/bluetooth_remote_gatt_service.h"
|
| #include "device/bluetooth/bluetooth_uuid.h"
|
| #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace device {
|
|
|
| -class BluetoothGattCharacteristic;
|
| +class BluetoothRemoteGattCharacteristic;
|
| class MockBluetoothDevice;
|
|
|
| -class MockBluetoothGattService : public BluetoothGattService {
|
| +class MockBluetoothGattService : public BluetoothRemoteGattService {
|
| public:
|
| MockBluetoothGattService(MockBluetoothDevice* device,
|
| const std::string& identifier,
|
| @@ -36,16 +36,17 @@ class MockBluetoothGattService : public BluetoothGattService {
|
| MOCK_CONST_METHOD0(IsPrimary, bool());
|
| MOCK_CONST_METHOD0(GetDevice, BluetoothDevice*());
|
| MOCK_CONST_METHOD0(GetCharacteristics,
|
| - std::vector<BluetoothGattCharacteristic*>());
|
| - MOCK_CONST_METHOD0(GetIncludedServices, std::vector<BluetoothGattService*>());
|
| + std::vector<BluetoothRemoteGattCharacteristic*>());
|
| + MOCK_CONST_METHOD0(GetIncludedServices,
|
| + std::vector<BluetoothRemoteGattService*>());
|
| MOCK_CONST_METHOD1(GetCharacteristic,
|
| - BluetoothGattCharacteristic*(const std::string&));
|
| - MOCK_METHOD1(AddCharacteristic, bool(BluetoothGattCharacteristic*));
|
| - MOCK_METHOD1(AddIncludedService, bool(BluetoothGattService*));
|
| + BluetoothRemoteGattCharacteristic*(const std::string&));
|
| + MOCK_METHOD1(AddCharacteristic, bool(BluetoothRemoteGattCharacteristic*));
|
| + MOCK_METHOD1(AddIncludedService, bool(BluetoothRemoteGattService*));
|
| MOCK_METHOD2(Register, void(const base::Closure&, const ErrorCallback&));
|
| MOCK_METHOD2(Unregister, void(const base::Closure&, const ErrorCallback&));
|
|
|
| - // BluetoothGattService manages the lifetime of its
|
| + // BluetoothRemoteGattService manages the lifetime of its
|
| // BluetoothGATTCharacteristics.
|
| // This method takes ownership of the MockBluetoothGATTCharacteristics. This
|
| // is only for convenience as far as testing is concerned, and it's possible
|
| @@ -57,8 +58,9 @@ class MockBluetoothGattService : public BluetoothGattService {
|
| // &MockBluetoothGattService::GetMockCharacteristics));
|
| void AddMockCharacteristic(
|
| std::unique_ptr<MockBluetoothGattCharacteristic> mock_characteristic);
|
| - std::vector<BluetoothGattCharacteristic*> GetMockCharacteristics() const;
|
| - BluetoothGattCharacteristic* GetMockCharacteristic(
|
| + std::vector<BluetoothRemoteGattCharacteristic*> GetMockCharacteristics()
|
| + const;
|
| + BluetoothRemoteGattCharacteristic* GetMockCharacteristic(
|
| const std::string& identifier) const;
|
|
|
| private:
|
|
|