| Index: base/threading/sequenced_task_runner_handle.cc
|
| diff --git a/base/threading/sequenced_task_runner_handle.cc b/base/threading/sequenced_task_runner_handle.cc
|
| index a03642de42061cef29a2842fee5abbbc9a17df44..097194512d6ade730f8e65e2a6c20a645bcb2844 100644
|
| --- a/base/threading/sequenced_task_runner_handle.cc
|
| +++ b/base/threading/sequenced_task_runner_handle.cc
|
| @@ -12,26 +12,17 @@ namespace base {
|
|
|
| // static
|
| scoped_refptr<SequencedTaskRunner> SequencedTaskRunnerHandle::Get() {
|
| - // If we are on a worker thread for a SequencedBlockingPool that is running a
|
| - // sequenced task, return a SequencedTaskRunner for it.
|
| - scoped_refptr<base::SequencedWorkerPool> pool =
|
| - SequencedWorkerPool::GetWorkerPoolForCurrentThread();
|
| - if (pool) {
|
| - SequencedWorkerPool::SequenceToken sequence_token =
|
| - SequencedWorkerPool::GetSequenceTokenForCurrentThread();
|
| - DCHECK(sequence_token.IsValid());
|
| - DCHECK(pool->IsRunningSequenceOnCurrentThread(sequence_token));
|
| - return pool->GetSequencedTaskRunner(sequence_token);
|
| - }
|
| -
|
| - // Otherwise, return a SingleThreadTaskRunner for the current thread.
|
| - return base::ThreadTaskRunnerHandle::Get();
|
| + // Return the SequencedTaskRunner if found or the SingleThreadedTaskRunner for
|
| + // the current thread otherwise.
|
| + scoped_refptr<base::SequencedTaskRunner> task_runner =
|
| + SequencedWorkerPool::GetSequencedTaskRunnerForCurrentThread();
|
| + return task_runner ? task_runner : scoped_refptr<SequencedTaskRunner>(
|
| + base::ThreadTaskRunnerHandle::Get());
|
| }
|
|
|
| // static
|
| bool SequencedTaskRunnerHandle::IsSet() {
|
| - return (SequencedWorkerPool::GetWorkerPoolForCurrentThread() &&
|
| - SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid()) ||
|
| + return SequencedWorkerPool::GetSequencedTaskRunnerForCurrentThread() ||
|
| base::ThreadTaskRunnerHandle::IsSet();
|
| }
|
|
|
|
|