| Index: device/bluetooth/test/bluetooth_test.h
|
| diff --git a/device/bluetooth/test/bluetooth_test.h b/device/bluetooth/test/bluetooth_test.h
|
| index e331b42d026e201edb7121c305a59815c160767a..275fbbb85fdfafea2490a397f0ac8cee7aa49d59 100644
|
| --- a/device/bluetooth/test/bluetooth_test.h
|
| +++ b/device/bluetooth/test/bluetooth_test.h
|
| @@ -75,14 +75,14 @@ class BluetoothTestBase : public testing::Test {
|
| virtual BluetoothDevice* DiscoverLowEnergyDevice(int device_ordinal);
|
|
|
| // Simulates success of implementation details of CreateGattConnection.
|
| - virtual void CompleteGattConnection(BluetoothDevice* device) {}
|
| + virtual void SimulateGattConnection(BluetoothDevice* device) {}
|
|
|
| // Simulates failure of CreateGattConnection with the given error code.
|
| - virtual void FailGattConnection(BluetoothDevice* device,
|
| - BluetoothDevice::ConnectErrorCode) {}
|
| + virtual void SimulateGattConnectionError(BluetoothDevice* device,
|
| + BluetoothDevice::ConnectErrorCode) {}
|
|
|
| // Simulates GattConnection disconnecting.
|
| - virtual void CompleteGattDisconnection(BluetoothDevice* device) {}
|
| + virtual void SimulateGattDisconnection(BluetoothDevice* device) {}
|
|
|
| // Remove the device from the adapter and delete it.
|
| virtual void DeleteDevice(BluetoothDevice* device);
|
| @@ -115,8 +115,8 @@ class BluetoothTestBase : public testing::Test {
|
| BluetoothDevice::ERROR_UNKNOWN;
|
| int callback_count_ = 0;
|
| int error_callback_count_ = 0;
|
| - int gatt_connection_attempt_count_ = 0;
|
| - int gatt_disconnection_attempt_count_ = 0;
|
| + int gatt_connection_attempts_ = 0;
|
| + int gatt_disconnection_attempts_ = 0;
|
| base::WeakPtrFactory<BluetoothTestBase> weak_factory_;
|
| };
|
|
|
|
|