2019-07-16 19:59:21 +02:00
|
|
|
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
|
2019-10-01 15:55:16 +02:00
|
|
|
index f2ddb987a4de..a309caf4c670 100644
|
2019-07-16 19:59:21 +02:00
|
|
|
--- content/browser/scheduler/browser_task_executor.cc
|
|
|
|
|
+++ content/browser/scheduler/browser_task_executor.cc
|
2019-10-01 15:55:16 +02:00
|
|
|
@@ -136,10 +136,11 @@ void BrowserTaskExecutor::PostFeatureListSetup() {
|
2019-07-16 19:59:21 +02:00
|
|
|
|
|
|
|
|
// static
|
|
|
|
|
void BrowserTaskExecutor::Shutdown() {
|
|
|
|
|
- if (!g_browser_task_executor)
|
|
|
|
|
+ if (!g_browser_task_executor ||
|
|
|
|
|
+ !g_browser_task_executor->browser_ui_thread_scheduler_) {
|
|
|
|
|
return;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
- DCHECK(g_browser_task_executor->browser_ui_thread_scheduler_);
|
|
|
|
|
// We don't delete |g_browser_task_executor| because other threads may
|
|
|
|
|
// PostTask or call BrowserTaskExecutor::GetTaskRunner while we're tearing
|
|
|
|
|
// things down. We don't want to add locks so we just leak instead of dealing
|
