| Index: device/bluetooth/test/bluetooth_test_win.h
|
| diff --git a/device/bluetooth/test/bluetooth_test_win.h b/device/bluetooth/test/bluetooth_test_win.h
|
| index 459b992b3dd8f1c054290d60bd0ec67a1c97ab09..f6824dfb3508204b13147e2417c2e521286753ff 100644
|
| --- a/device/bluetooth/test/bluetooth_test_win.h
|
| +++ b/device/bluetooth/test/bluetooth_test_win.h
|
| @@ -20,7 +20,6 @@ class BluetoothRemoteGattCharacteristicWin;
|
|
|
| // Windows implementation of BluetoothTestBase.
|
| class BluetoothTestWin : public BluetoothTestBase,
|
| - public BluetoothTaskManagerWin::Observer,
|
| public win::BluetoothLowEnergyWrapperFake::Observer {
|
| public:
|
| BluetoothTestWin();
|
| @@ -32,6 +31,7 @@ class BluetoothTestWin : public BluetoothTestBase,
|
| void InitWithoutDefaultAdapter() override;
|
| void InitWithFakeAdapter() override;
|
| bool DenyPermission() override;
|
| + void RunUntilIdle() override;
|
| void StartLowEnergyDiscoverySession() override;
|
| BluetoothDevice* DiscoverLowEnergyDevice(int device_ordinal) override;
|
| void SimulateGattConnection(BluetoothDevice* device) override;
|
| @@ -58,17 +58,26 @@ class BluetoothTestWin : public BluetoothTestBase,
|
| void SimulateGattCharacteristicWriteError(
|
| BluetoothGattCharacteristic* characteristic,
|
| BluetoothGattService::GattErrorCode error_code) override;
|
| + virtual void SimulateGattCharacteristicSetNotifyWillFailSynchronouslyOnce(
|
| + BluetoothGattCharacteristic* characteristic) override;
|
| void DeleteDevice(BluetoothDevice* device) override;
|
| void SimulateGattDescriptor(BluetoothGattCharacteristic* characteristic,
|
| const std::string& uuid) override;
|
| -
|
| - // BluetoothTaskManagerWin::Observer overrides.
|
| - void OnAttemptReadGattCharacteristic() override;
|
| - void OnAttemptWriteGattCharacteristic() override;
|
| + void SimulateGattDescriptorWriteWillFailSynchronouslyOnce(
|
| + BluetoothGattDescriptor* descriptor) override;
|
| + void SimulateGattNotifySessionStarted(
|
| + BluetoothGattCharacteristic* characteristic) override;
|
| + void SimulateGattCharacteristicChanged(
|
| + BluetoothGattCharacteristic* characteristic,
|
| + const std::vector<uint8_t>& value) override;
|
|
|
| // win::BluetoothLowEnergyWrapperFake::Observer overrides.
|
| - void onWriteGattCharacteristicValue(
|
| + void OnReadGattCharacteristicValue() override;
|
| + void OnWriteGattCharacteristicValue(
|
| const PBTH_LE_GATT_CHARACTERISTIC_VALUE value) override;
|
| + void OnWriteGattDescriptorValue(
|
| + const PBTH_LE_GATT_DESCRIPTOR_VALUE value) override;
|
| + void OnStartCharacteristicNotification() override;
|
|
|
| private:
|
| scoped_refptr<base::TestSimpleTaskRunner> ui_task_runner_;
|
|
|