Index: base/threading/sequenced_worker_pool.cc |
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc |
index 59c4187a063906bd2bf47d283e0265ad75d44ece..3bc26b45351fb45a2f04f291910edf8d3bc8ffe6 100644 |
--- a/base/threading/sequenced_worker_pool.cc |
+++ b/base/threading/sequenced_worker_pool.cc |
@@ -62,9 +62,6 @@ class SequencedWorkerPoolTaskRunner : public TaskRunner { |
// TaskRunner implementation |
virtual bool PostDelayedTask(const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) OVERRIDE; |
- virtual bool PostDelayedTask(const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) OVERRIDE; |
virtual bool RunsTasksOnCurrentThread() const OVERRIDE; |
@@ -76,10 +73,6 @@ class SequencedWorkerPoolTaskRunner : public TaskRunner { |
bool PostDelayedTaskAssertZeroDelay( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms); |
- bool PostDelayedTaskAssertZeroDelay( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay); |
const scoped_refptr<SequencedWorkerPool> pool_; |
@@ -102,13 +95,6 @@ SequencedWorkerPoolTaskRunner::~SequencedWorkerPoolTaskRunner() { |
bool SequencedWorkerPoolTaskRunner::PostDelayedTask( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) { |
- return PostDelayedTaskAssertZeroDelay(from_here, task, delay_ms); |
-} |
- |
-bool SequencedWorkerPoolTaskRunner::PostDelayedTask( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) { |
return PostDelayedTaskAssertZeroDelay(from_here, task, delay); |
} |
@@ -120,24 +106,15 @@ bool SequencedWorkerPoolTaskRunner::RunsTasksOnCurrentThread() const { |
bool SequencedWorkerPoolTaskRunner::PostDelayedTaskAssertZeroDelay( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) { |
+ TimeDelta delay) { |
// TODO(francoisk777@gmail.com): Change the following two statements once |
// SequencedWorkerPool supports non-zero delays. |
- DCHECK_EQ(delay_ms, 0) |
+ DCHECK_EQ(delay.InMillisecondsRoundedUp(), 0) |
<< "SequencedWorkerPoolTaskRunner does not yet support non-zero delays"; |
return pool_->PostWorkerTaskWithShutdownBehavior( |
from_here, task, shutdown_behavior_); |
} |
-bool SequencedWorkerPoolTaskRunner::PostDelayedTaskAssertZeroDelay( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
- TimeDelta delay) { |
- return PostDelayedTaskAssertZeroDelay(from_here, |
- task, |
- delay.InMillisecondsRoundedUp()); |
-} |
- |
// SequencedWorkerPoolSequencedTaskRunner ------------------------------------ |
// A SequencedTaskRunner which posts tasks to a SequencedWorkerPool with a |
// fixed sequence token. |
@@ -153,9 +130,6 @@ class SequencedWorkerPoolSequencedTaskRunner : public SequencedTaskRunner { |
// TaskRunner implementation |
virtual bool PostDelayedTask(const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) OVERRIDE; |
- virtual bool PostDelayedTask(const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) OVERRIDE; |
virtual bool RunsTasksOnCurrentThread() const OVERRIDE; |
@@ -163,10 +137,6 @@ class SequencedWorkerPoolSequencedTaskRunner : public SequencedTaskRunner { |
virtual bool PostNonNestableDelayedTask( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) OVERRIDE; |
- virtual bool PostNonNestableDelayedTask( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) OVERRIDE; |
private: |
@@ -177,10 +147,6 @@ class SequencedWorkerPoolSequencedTaskRunner : public SequencedTaskRunner { |
bool PostDelayedTaskAssertZeroDelay( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms); |
- bool PostDelayedTaskAssertZeroDelay( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay); |
const scoped_refptr<SequencedWorkerPool> pool_; |
@@ -208,13 +174,6 @@ SequencedWorkerPoolSequencedTaskRunner:: |
bool SequencedWorkerPoolSequencedTaskRunner::PostDelayedTask( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) { |
- return PostDelayedTaskAssertZeroDelay(from_here, task, delay_ms); |
-} |
- |
-bool SequencedWorkerPoolSequencedTaskRunner::PostDelayedTask( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) { |
return PostDelayedTaskAssertZeroDelay(from_here, task, delay); |
} |
@@ -226,13 +185,6 @@ bool SequencedWorkerPoolSequencedTaskRunner::RunsTasksOnCurrentThread() const { |
bool SequencedWorkerPoolSequencedTaskRunner::PostNonNestableDelayedTask( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) { |
- return PostDelayedTaskAssertZeroDelay(from_here, task, delay_ms); |
-} |
- |
-bool SequencedWorkerPoolSequencedTaskRunner::PostNonNestableDelayedTask( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) { |
return PostDelayedTaskAssertZeroDelay(from_here, task, delay); |
} |
@@ -240,25 +192,16 @@ bool SequencedWorkerPoolSequencedTaskRunner::PostNonNestableDelayedTask( |
bool SequencedWorkerPoolSequencedTaskRunner::PostDelayedTaskAssertZeroDelay( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) { |
+ TimeDelta delay) { |
// TODO(francoisk777@gmail.com): Change the following two statements once |
// SequencedWorkerPool supports non-zero delays. |
- DCHECK_EQ(delay_ms, 0) |
+ DCHECK_EQ(delay.InMillisecondsRoundedUp(), 0) |
<< "SequencedWorkerPoolSequencedTaskRunner does not yet support non-zero" |
" delays"; |
return pool_->PostSequencedWorkerTaskWithShutdownBehavior( |
token_, from_here, task, shutdown_behavior_); |
} |
-bool SequencedWorkerPoolSequencedTaskRunner::PostDelayedTaskAssertZeroDelay( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
- TimeDelta delay) { |
- return PostDelayedTaskAssertZeroDelay(from_here, |
- task, |
- delay.InMillisecondsRoundedUp()); |
-} |
- |
} // namespace |
// Worker --------------------------------------------------------------------- |
@@ -1033,15 +976,6 @@ bool SequencedWorkerPool::PostSequencedWorkerTaskWithShutdownBehavior( |
bool SequencedWorkerPool::PostDelayedTask( |
const tracked_objects::Location& from_here, |
const Closure& task, |
- int64 delay_ms) { |
- // TODO(akalin): Add support for non-zero delays. |
- DCHECK_EQ(delay_ms, 0); |
- return PostWorkerTask(from_here, task); |
-} |
- |
-bool SequencedWorkerPool::PostDelayedTask( |
- const tracked_objects::Location& from_here, |
- const Closure& task, |
TimeDelta delay) { |
// TODO(akalin): Add support for non-zero delays. |
DCHECK_EQ(delay.InMillisecondsRoundedUp(), 0); |