| Index: device/bluetooth/test/bluetooth_test.cc
|
| diff --git a/device/bluetooth/test/bluetooth_test.cc b/device/bluetooth/test/bluetooth_test.cc
|
| index 81a97206e011420b9e5b71fca6ff7bc5882aa2f9..ca050881a381658fe9899e3f316ef633ee292b56 100644
|
| --- a/device/bluetooth/test/bluetooth_test.cc
|
| +++ b/device/bluetooth/test/bluetooth_test.cc
|
| @@ -151,7 +151,7 @@ void BluetoothTestBase::ConnectErrorCallback(
|
|
|
| void BluetoothTestBase::GattErrorCallback(
|
| Call expected,
|
| - BluetoothGattService::GattErrorCode error_code) {
|
| + BluetoothRemoteGattService::GattErrorCode error_code) {
|
| ++error_callback_count_;
|
| last_gatt_error_code_ = error_code;
|
|
|
| @@ -184,7 +184,7 @@ BluetoothTestBase::GetGattConnectionCallback(Call expected) {
|
| weak_factory_.GetWeakPtr(), expected);
|
| }
|
|
|
| -BluetoothGattCharacteristic::NotifySessionCallback
|
| +BluetoothRemoteGattCharacteristic::NotifySessionCallback
|
| BluetoothTestBase::GetNotifyCallback(Call expected) {
|
| if (expected == Call::EXPECTED)
|
| ++expected_success_callback_calls_;
|
| @@ -192,7 +192,7 @@ BluetoothTestBase::GetNotifyCallback(Call expected) {
|
| weak_factory_.GetWeakPtr(), expected);
|
| }
|
|
|
| -BluetoothGattCharacteristic::ValueCallback
|
| +BluetoothRemoteGattCharacteristic::ValueCallback
|
| BluetoothTestBase::GetReadValueCallback(Call expected) {
|
| if (expected == Call::EXPECTED)
|
| ++expected_success_callback_calls_;
|
| @@ -216,7 +216,7 @@ BluetoothTestBase::GetConnectErrorCallback(Call expected) {
|
| weak_factory_.GetWeakPtr(), expected);
|
| }
|
|
|
| -base::Callback<void(BluetoothGattService::GattErrorCode)>
|
| +base::Callback<void(BluetoothRemoteGattService::GattErrorCode)>
|
| BluetoothTestBase::GetGattErrorCallback(Call expected) {
|
| if (expected == Call::EXPECTED)
|
| ++expected_error_callback_calls_;
|
|
|