Commit d897e236 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Migrate off BrowserThread::DeleteSoon in /headless

Instead use base::DeleteSoon which enforces usage of TaskTraits.

This CL is a no-op as-is. It was recently discovered however that some
callers did BrowserThread::DeleteSoon() with pending tasks running on
different task queues (different traits  -- e.g.

TaskTraits to make this more obvious. Please review whether calls in
this CL can be migrated as-is or need additional traits to match
potentially pending tasks.

Split from https://chromium-review.googlesource.com/c/chromium/src/+/1894109
for cursory review.

This CL was uploaded by git cl split.

R=johannes@chromium.org


TaskPriority: :BEST_EFFORT) which can result in out-of-order deletion...
BrowserThread: :DeleteSoon() is being migrated to base::DeleteSoon() w/
Bug: 1019767
Change-Id: I0d64a4d78e73c5adfdb7f62b0be377a3a4b4cdf7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895648
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711781}
parent 49db6b1c
...@@ -54,8 +54,8 @@ HeadlessBrowserContextImpl::~HeadlessBrowserContextImpl() { ...@@ -54,8 +54,8 @@ HeadlessBrowserContextImpl::~HeadlessBrowserContextImpl() {
web_contents_map_.clear(); web_contents_map_.clear();
if (request_context_manager_) { if (request_context_manager_) {
content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, base::DeleteSoon(FROM_HERE, {content::BrowserThread::IO},
request_context_manager_.release()); request_context_manager_.release());
} }
ShutdownStoragePartitions(); ShutdownStoragePartitions();
......
...@@ -63,9 +63,8 @@ void HeadlessBrowserImpl::Shutdown() { ...@@ -63,9 +63,8 @@ void HeadlessBrowserImpl::Shutdown() {
weak_ptr_factory_.InvalidateWeakPtrs(); weak_ptr_factory_.InvalidateWeakPtrs();
browser_contexts_.clear(); browser_contexts_.clear();
if (system_request_context_manager_) { if (system_request_context_manager_) {
content::BrowserThread::DeleteSoon( base::DeleteSoon(FROM_HERE, {content::BrowserThread::IO},
content::BrowserThread::IO, FROM_HERE, system_request_context_manager_.release());
system_request_context_manager_.release());
} }
browser_main_parts_->QuitMainMessageLoop(); browser_main_parts_->QuitMainMessageLoop();
} }
......
...@@ -173,7 +173,7 @@ TestNetworkInterceptor::TestNetworkInterceptor() { ...@@ -173,7 +173,7 @@ TestNetworkInterceptor::TestNetworkInterceptor() {
} }
TestNetworkInterceptor::~TestNetworkInterceptor() { TestNetworkInterceptor::~TestNetworkInterceptor() {
BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, impl_.release()); base::DeleteSoon(FROM_HERE, {BrowserThread::IO}, impl_.release());
interceptor_.reset(); interceptor_.reset();
} }
......
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