Commit 1fc6b437 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

Smart Lock: Clean up EasyUnlockService subclass pointers on Shutdown.

Likely fixes crashes during shutdown seen in Smart Lock.

R=hansberry@chromium.org

Bug: 969142
Fixes: 969142
Test: none
Change-Id: I9c55e5995c27c2a93005e549a98b319f056123a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1639320
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarRyan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665584}
parent 9eee8dcc
......@@ -385,6 +385,7 @@ void EasyUnlockServiceRegular::InitializeInternal() {
void EasyUnlockServiceRegular::ShutdownInternal() {
pref_manager_.reset();
notification_controller_.reset();
proximity_auth::ScreenlockBridge::Get()->RemoveObserver(this);
......
......@@ -321,6 +321,10 @@ void EasyUnlockServiceSignin::ShutdownInternal() {
return;
service_active_ = false;
remote_device_cache_.reset();
challenge_wrapper_.reset();
pref_manager_.reset();
weak_ptr_factory_.InvalidateWeakPtrs();
proximity_auth::ScreenlockBridge::Get()->RemoveObserver(this);
user_data_.clear();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment