Index: base/threading/sequenced_worker_pool.h |
diff --git a/base/threading/sequenced_worker_pool.h b/base/threading/sequenced_worker_pool.h |
index 9369fb7adea535ea262a41ffe3850f133eddcb97..11381d2b888e745830b1a5eb7d656d5026d7b40d 100644 |
--- a/base/threading/sequenced_worker_pool.h |
+++ b/base/threading/sequenced_worker_pool.h |
@@ -45,7 +45,8 @@ class SequencedTaskRunner; |
// destruction will be visible to T2. |
// |
// Example: |
-// SequencedWorkerPool::SequenceToken token = pool.GetSequenceToken(); |
+// SequencedWorkerPool::SequenceToken token = |
+// SequencedWorkerPool::GetSequenceToken(); |
// pool.PostSequencedWorkerTask(token, SequencedWorkerPool::SKIP_ON_SHUTDOWN, |
// FROM_HERE, base::Bind(...)); |
// pool.PostSequencedWorkerTask(token, SequencedWorkerPool::SKIP_ON_SHUTDOWN, |
@@ -161,9 +162,18 @@ class BASE_EXPORT SequencedWorkerPool : public TaskRunner { |
// an unsequenced task, returns an invalid SequenceToken. |
static SequenceToken GetSequenceTokenForCurrentThread(); |
- // Returns the SequencedWorkerPool that owns this thread, or null if the |
- // current thread is not a SequencedWorkerPool worker thread. |
- static scoped_refptr<SequencedWorkerPool> GetWorkerPoolForCurrentThread(); |
+ // Gets a SequencedTaskRunner for the current thread. If the current thread is |
+ // running an unsequenced task, a new SequenceToken will be generated and set, |
+ // so that the returned SequencedTaskRunner is guaranteed to run tasks after |
+ // the current task has finished running. |
+ static scoped_refptr<SequencedTaskRunner> |
+ GetSequencedTaskRunnerForCurrentThread(); |
+ |
+ // Returns a unique token that can be used to sequence tasks posted to |
+ // PostSequencedWorkerTask(). Valid tokens are always nonzero. |
+ // TODO(bauerb): Rename this to better differentiate from |
+ // GetSequenceTokenForCurrentThread(). |
+ static SequenceToken GetSequenceToken(); |
// When constructing a SequencedWorkerPool, there must be a |
// ThreadTaskRunnerHandle on the current thread unless you plan to |
@@ -180,10 +190,6 @@ class BASE_EXPORT SequencedWorkerPool : public TaskRunner { |
const std::string& thread_name_prefix, |
TestingObserver* observer); |
- // Returns a unique token that can be used to sequence tasks posted to |
- // PostSequencedWorkerTask(). Valid tokens are always nonzero. |
- SequenceToken GetSequenceToken(); |
- |
// Returns the sequence token associated with the given name. Calling this |
// function multiple times with the same string will always produce the |
// same sequence token. If the name has not been used before, a new token |