From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/update_client/task_update.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'chromium/components/update_client/task_update.cc') diff --git a/chromium/components/update_client/task_update.cc b/chromium/components/update_client/task_update.cc index 733649b5711..4d78c55fbb3 100644 --- a/chromium/components/update_client/task_update.cc +++ b/chromium/components/update_client/task_update.cc @@ -57,9 +57,16 @@ std::vector TaskUpdate::GetIds() const { void TaskUpdate::TaskComplete(Error error) { DCHECK(thread_checker_.CalledOnValidThread()); + // NOTE: Do not post the callback_ directly to the task thread to ensure the + // UpdateClient reference (to which the callback is bound) does not get + // released before the callback is run during shutdown, when the task runner + // gets destroyed. base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::BindOnce(std::move(callback_), base::WrapRefCounted(this), error)); + FROM_HERE, base::BindOnce(&TaskUpdate::RunCallback, this, error)); +} + +void TaskUpdate::RunCallback(Error error) { + std::move(callback_).Run(this, error); } } // namespace update_client -- cgit v1.2.1