diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp index 412f32195680..5f38bd6baff5 100644 --- a/dom/bluetooth/linux/BluetoothDBusService.cpp +++ b/dom/bluetooth/linux/BluetoothDBusService.cpp @@ -2158,38 +2158,6 @@ private: BluetoothValue mValues; }; -class BluetoothArrayOfDevicePropertiesRunnable : public nsRunnable -{ -public: - BluetoothArrayOfDevicePropertiesRunnable( - const nsTArray& aDeviceAddresses, - BluetoothReplyRunnable* aRunnable, - FilterFunc aFilterFunc) - : mDeviceAddresses(aDeviceAddresses) - , mRunnable(dont_AddRef(aRunnable)) - , mFilterFunc(aFilterFunc) - { - } - - nsresult Run() - { - MOZ_ASSERT(!NS_IsMainThread()); - - nsRefPtr handler = - new BluetoothArrayOfDevicePropertiesReplyHandler(mDeviceAddresses, - mFilterFunc, - mRunnable); - handler->ProcessRemainingDeviceAddresses(); - - return NS_OK; - } - -private: - nsTArray mDeviceAddresses; - nsRefPtr mRunnable; - FilterFunc mFilterFunc; -}; - nsresult BluetoothDBusService::GetConnectedDevicePropertiesInternal(uint16_t aProfileId, BluetoothReplyRunnable* aRunnable) @@ -2226,13 +2194,12 @@ BluetoothDBusService::GetConnectedDevicePropertiesInternal(uint16_t aProfileId, } nsRefPtr runnable = aRunnable; - nsRefPtr func( - new BluetoothArrayOfDevicePropertiesRunnable(deviceAddresses, - runnable, - GetConnectedDevicesFilter)); - mBluetoothCommandThread->Dispatch(func, NS_DISPATCH_NORMAL); + nsRefPtr handler = + new BluetoothArrayOfDevicePropertiesReplyHandler(deviceAddresses, + GetConnectedDevicesFilter, + runnable); + handler->ProcessRemainingDeviceAddresses(); - runnable.forget(); return NS_OK; } @@ -2250,16 +2217,12 @@ BluetoothDBusService::GetPairedDevicePropertiesInternal( } nsRefPtr runnable = aRunnable; - nsRefPtr func( - new BluetoothArrayOfDevicePropertiesRunnable(aDeviceAddresses, - runnable, - GetPairedDevicesFilter)); - if (NS_FAILED(mBluetoothCommandThread->Dispatch(func, NS_DISPATCH_NORMAL))) { - NS_WARNING("Cannot dispatch task!"); - return NS_ERROR_FAILURE; - } + nsRefPtr handler = + new BluetoothArrayOfDevicePropertiesReplyHandler(aDeviceAddresses, + GetPairedDevicesFilter, + runnable); + handler->ProcessRemainingDeviceAddresses(); - runnable.forget(); return NS_OK; }