| Index: device/bluetooth/test/bluetooth_test.h
|
| diff --git a/device/bluetooth/test/bluetooth_test.h b/device/bluetooth/test/bluetooth_test.h
|
| index 7a0ed0e29f4d06d278ab356f50088815ea90a80d..37c68029867ef47e500dd09bbb1833c992788460 100644
|
| --- a/device/bluetooth/test/bluetooth_test.h
|
| +++ b/device/bluetooth/test/bluetooth_test.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_discovery_session.h"
|
| +#include "device/bluetooth/bluetooth_gatt_connection.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace device {
|
| @@ -66,15 +67,22 @@ class BluetoothTestBase : public testing::Test {
|
| // kTestDeviceAddress2.
|
| virtual void DiscoverLowEnergyDevice(int device_ordinal){};
|
|
|
| + // Simulate success of implementation details of CreateGattConnection.
|
| + virtual void CompleteGattConnection(BluetoothDevice* device){};
|
| +
|
| // Callbacks that increment |callback_count_|, |error_callback_count_|:
|
| void Callback();
|
| void DiscoverySessionCallback(scoped_ptr<BluetoothDiscoverySession>);
|
| + void GattConnectionCallback(scoped_ptr<BluetoothGattConnection>);
|
| void ErrorCallback();
|
| + void ConnectErrorCallback(enum BluetoothDevice::ConnectErrorCode);
|
|
|
| // Accessors to get callbacks bound to this fixture:
|
| base::Closure GetCallback();
|
| BluetoothAdapter::DiscoverySessionCallback GetDiscoverySessionCallback();
|
| + BluetoothDevice::GattConnectionCallback GetGattConnectionCallback();
|
| BluetoothAdapter::ErrorCallback GetErrorCallback();
|
| + BluetoothDevice::ConnectErrorCallback GetConnectErrorCallback();
|
|
|
| // A Message loop is required by some implementations that will PostTasks and
|
| // by base::RunLoop().RunUntilIdle() use in this fixuture.
|
| @@ -82,9 +90,11 @@ class BluetoothTestBase : public testing::Test {
|
|
|
| scoped_refptr<BluetoothAdapter> adapter_;
|
| ScopedVector<BluetoothDiscoverySession> discovery_sessions_;
|
| + ScopedVector<BluetoothGattConnection> gatt_connections_;
|
| + enum BluetoothDevice::ConnectErrorCode last_connect_error_code_ =
|
| + BluetoothDevice::ERROR_UNKNOWN;
|
| int callback_count_ = 0;
|
| int error_callback_count_ = 0;
|
| - bool run_message_loop_to_wait_for_callbacks_ = true;
|
| };
|
|
|
| } // namespace device
|
|
|