Allow SequencedTaskRunnerHandle::Get() while running unsequenced tasks.

base/threading/sequenced_task_runner_handle.cc

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>(

[danakj, 2015/11/17 22:03:39]

I liked without the ?: better >__>

[Bernhard Bauer, 2015/11/18 13:15:50]

FWIW, I agree, so I changed it back to two return statements for now. Gab, do
you feel strongly about this?

[gab, 2015/11/18 22:37:33]

Nope, either way is fine (would have preferred this if it wasn't for the ugly
cast).

+                                         base::ThreadTaskRunnerHandle::Get());
 }
 
 // static
 bool SequencedTaskRunnerHandle::IsSet() {
-  return (SequencedWorkerPool::GetWorkerPoolForCurrentThread() &&
-          SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid()) ||
+  return SequencedWorkerPool::GetSequencedTaskRunnerForCurrentThread() ||
          base::ThreadTaskRunnerHandle::IsSet();
 }