Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
index 1ca33d32863b8866ac9d7b2e60569e985763a890..4e5f6208a44ab962fa576aac7cf31f8deedc626d 100644 |
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc |
@@ -1049,16 +1049,11 @@ EasyUnlockPrivateSetAutoPairingResultFunction::Run() { |
} |
EasyUnlockPrivateFindSetupConnectionFunction:: |
- EasyUnlockPrivateFindSetupConnectionFunction() |
- : bluetooth_throttler_(new cryptauth::BluetoothThrottlerImpl( |
- base::MakeUnique<base::DefaultTickClock>())) {} |
+ EasyUnlockPrivateFindSetupConnectionFunction() {} |
EasyUnlockPrivateFindSetupConnectionFunction:: |
~EasyUnlockPrivateFindSetupConnectionFunction() { |
- // |connection_finder_| has a raw pointer to |bluetooth_throttler_|, so it |
- // should be destroyed first. |
connection_finder_.reset(); |
- bluetooth_throttler_.reset(); |
} |
void EasyUnlockPrivateFindSetupConnectionFunction:: |
@@ -1092,7 +1087,7 @@ bool EasyUnlockPrivateFindSetupConnectionFunction::RunAsync() { |
new proximity_auth::BluetoothLowEnergyConnectionFinder( |
cryptauth::RemoteDevice(), params->setup_service_uuid, |
proximity_auth::BluetoothLowEnergyConnectionFinder::FIND_ANY_DEVICE, |
- nullptr, bluetooth_throttler_.get(), 3)); |
+ nullptr, cryptauth::BluetoothThrottlerImpl::GetInstance(), 3)); |
connection_finder_->Find(base::Bind( |
&EasyUnlockPrivateFindSetupConnectionFunction::OnConnectionFound, this)); |