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 021cc599bdc42861c9ccad9f5ca812fafb0f673e..e7ca3dac804873b4ec6ff49b4a49eb71d5846a7f 100644 |
--- a/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h |
+++ b/device/bluetooth/test/mock_bluetooth_gatt_characteristic.h |
@@ -12,7 +12,9 @@ |
#include "base/callback.h" |
#include "base/macros.h" |
+#include "base/memory/scoped_vector.h" |
#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h" |
+#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h" |
#include "device/bluetooth/bluetooth_uuid.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -20,6 +22,7 @@ namespace device { |
class BluetoothRemoteGattDescriptor; |
class BluetoothRemoteGattService; |
+class MockBluetoothGattDescriptor; |
class MockBluetoothGattService; |
class MockBluetoothGattCharacteristic |
@@ -58,6 +61,12 @@ class MockBluetoothGattCharacteristic |
const base::Closure&, |
const ErrorCallback&)); |
+ void AddMockDescriptor( |
+ std::unique_ptr<MockBluetoothGattDescriptor> mock_descriptor); |
+ std::vector<BluetoothRemoteGattDescriptor*> GetMockDescriptors() const; |
+ BluetoothRemoteGattDescriptor* GetMockDescriptor( |
+ const std::string& identifier) const; |
+ |
protected: |
MOCK_METHOD3(SubscribeToNotifications, |
void(BluetoothRemoteGattDescriptor*, |
@@ -69,6 +78,8 @@ class MockBluetoothGattCharacteristic |
const ErrorCallback&)); |
private: |
+ ScopedVector<MockBluetoothGattDescriptor> mock_descriptors_; |
dcheng
2016/12/09 08:17:57
Please use std::vector<std::unique_ptr<...>> in ne
dcheng
2016/12/12 20:56:06
Looks like the uploaded patchset didn't include ch
|
+ |
DISALLOW_COPY_AND_ASSIGN(MockBluetoothGattCharacteristic); |
}; |