| Index: base/task_scheduler/task_scheduler_impl.h
|
| diff --git a/base/task_scheduler/task_scheduler_impl.h b/base/task_scheduler/task_scheduler_impl.h
|
| index 9a161037fee8915fd95cd7e19102b81911fa5dbc..0e03d52cd06e358fd50337bd4c5cd13ad868d65e 100644
|
| --- a/base/task_scheduler/task_scheduler_impl.h
|
| +++ b/base/task_scheduler/task_scheduler_impl.h
|
| @@ -62,7 +62,10 @@ class BASE_EXPORT TaskSchedulerImpl : public TaskScheduler {
|
| std::vector<const HistogramBase*> GetHistograms() const override;
|
| void Shutdown() override;
|
| void FlushForTesting() override;
|
| - void JoinForTesting() override;
|
| +
|
| + // Joins all threads. Tasks that are already running are allowed to complete
|
| + // their execution. This can only be called once.
|
| + void JoinForTesting();
|
|
|
| private:
|
| explicit TaskSchedulerImpl(const WorkerPoolIndexForTraitsCallback&
|
|
|