| Index: base/task_scheduler/task_scheduler_impl.cc
|
| diff --git a/base/task_scheduler/task_scheduler_impl.cc b/base/task_scheduler/task_scheduler_impl.cc
|
| index 2f5b68f6a78f6328580d95302a8905805801659b..0a978ae23ea96a200ac9720b69753b783d991763 100644
|
| --- a/base/task_scheduler/task_scheduler_impl.cc
|
| +++ b/base/task_scheduler/task_scheduler_impl.cc
|
| @@ -30,7 +30,7 @@ std::unique_ptr<TaskSchedulerImpl> TaskSchedulerImpl::Create(
|
|
|
| TaskSchedulerImpl::~TaskSchedulerImpl() {
|
| #if DCHECK_IS_ON()
|
| - DCHECK(join_for_testing_returned_.IsSignaled());
|
| + DCHECK(join_for_testing_returned_.IsSet());
|
| #endif
|
| }
|
|
|
| @@ -58,13 +58,13 @@ void TaskSchedulerImpl::Shutdown() {
|
|
|
| void TaskSchedulerImpl::JoinForTesting() {
|
| #if DCHECK_IS_ON()
|
| - DCHECK(!join_for_testing_returned_.IsSignaled());
|
| + DCHECK(!join_for_testing_returned_.IsSet());
|
| #endif
|
| for (const auto& worker_pool : worker_pools_)
|
| worker_pool->JoinForTesting();
|
| service_thread_->JoinForTesting();
|
| #if DCHECK_IS_ON()
|
| - join_for_testing_returned_.Signal();
|
| + join_for_testing_returned_.Set();
|
| #endif
|
| }
|
|
|
| @@ -74,11 +74,6 @@ TaskSchedulerImpl::TaskSchedulerImpl(const WorkerPoolIndexForTraitsCallback&
|
| Bind(&TaskSchedulerImpl::OnDelayedRunTimeUpdated, Unretained(this))),
|
| worker_pool_index_for_traits_callback_(
|
| worker_pool_index_for_traits_callback)
|
| -#if DCHECK_IS_ON()
|
| - ,
|
| - join_for_testing_returned_(WaitableEvent::ResetPolicy::MANUAL,
|
| - WaitableEvent::InitialState::NOT_SIGNALED)
|
| -#endif
|
| {
|
| DCHECK(!worker_pool_index_for_traits_callback_.is_null());
|
| }
|
|
|