| Index: device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h
|
| diff --git a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h
|
| index 8e6258c7241f3c9949accea69a61dfa456a02921..2e8ece1865a437ba672eea0af9cfdd69074870b1 100644
|
| --- a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h
|
| +++ b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_impl.h
|
| @@ -33,6 +33,7 @@ class BluetoothLocalGattServiceBlueZ;
|
| class DEVICE_BLUETOOTH_EXPORT BluetoothGattApplicationServiceProviderImpl
|
| : public BluetoothGattApplicationServiceProvider {
|
| public:
|
| + // Use nullptr for |bus| to create for testing.
|
| BluetoothGattApplicationServiceProviderImpl(
|
| dbus::Bus* bus,
|
| const dbus::ObjectPath& object_path,
|
| @@ -40,10 +41,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattApplicationServiceProviderImpl
|
| services);
|
| ~BluetoothGattApplicationServiceProviderImpl() override;
|
|
|
| - // For testing.
|
| - BluetoothGattApplicationServiceProviderImpl(
|
| - const dbus::ObjectPath& object_path);
|
| -
|
| private:
|
| friend class BluetoothGattApplicationServiceProviderTest;
|
| FRIEND_TEST_ALL_PREFIXES(BluetoothGattApplicationServiceProviderTest,
|
| @@ -84,17 +81,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothGattApplicationServiceProviderImpl
|
| // Origin thread (i.e. the UI thread in production).
|
| base::PlatformThreadId origin_thread_id_;
|
|
|
| - // List of GATT Service service providers managed by this object manager.
|
| - std::vector<std::unique_ptr<BluetoothGattServiceServiceProvider>>
|
| - service_providers_;
|
| - // List of GATT Characteristic service providers managed by this object
|
| - // manager.
|
| - std::vector<std::unique_ptr<BluetoothGattCharacteristicServiceProvider>>
|
| - characteristic_providers_;
|
| - // List of GATT Descriptor service providers managed by this object manager.
|
| - std::vector<std::unique_ptr<BluetoothGattDescriptorServiceProvider>>
|
| - descriptor_providers_;
|
| -
|
| // D-Bus bus object is exported on, not owned by this object and must
|
| // outlive it.
|
| dbus::Bus* bus_;
|
|
|