From 8853f012ca0047aa009afb94eb9a02875dc3c15d Mon Sep 17 00:00:00 2001
From: "nhiroki@chromium.org"
 <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 28 Jan 2014 02:28:11 +0000
Subject: [PATCH] Threading: Remove TaskRunnerHandlesNonZeroDelays from
 TaskRunnerTestDelegate

This is no longer necessary (always returns true).


BUG=149144
TEST=n/a (no behavioral changes)

Review URL: https://codereview.chromium.org/146833008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247393 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../sequenced_task_runner_test_template.h     | 35 -------------------
 base/test/task_runner_test_template.h         | 10 ------
 .../sequenced_worker_pool_unittest.cc         | 12 -------
 3 files changed, 57 deletions(-)

diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h
index dacbb999e8d0fc..48f5354d9b594a 100644
--- a/base/test/sequenced_task_runner_test_template.h
+++ b/base/test/sequenced_task_runner_test_template.h
@@ -178,13 +178,6 @@ TYPED_TEST_P(SequencedTaskRunnerTest, SequentialNestable) {
 // that that the tasks are run in FIFO order and that there is no execution
 // overlap whatsoever between any two tasks.
 TYPED_TEST_P(SequencedTaskRunnerTest, SequentialDelayedNonNestable) {
-  // TODO(akalin): Remove this check (http://crbug.com/149144).
-  if (!this->delegate_.TaskRunnerHandlesNonZeroDelays()) {
-    DLOG(INFO) << "This SequencedTaskRunner doesn't handle "
-        "non-zero delays; skipping";
-    return;
-  }
-
   const int kTaskCount = 20;
   const int kDelayIncrementMs = 50;
 
@@ -236,13 +229,6 @@ TYPED_TEST_P(SequencedTaskRunnerTest, NonNestablePostFromNonNestableTask) {
 // This test posts a delayed task, and checks that the task is run later than
 // the specified time.
 TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTaskBasic) {
-  // TODO(akalin): Remove this check (http://crbug.com/149144).
-  if (!this->delegate_.TaskRunnerHandlesNonZeroDelays()) {
-    DLOG(INFO) << "This SequencedTaskRunner doesn't handle "
-        "non-zero delays; skipping";
-    return;
-  }
-
   const int kTaskCount = 1;
   const TimeDelta kDelay = TimeDelta::FromMilliseconds(100);
 
@@ -270,13 +256,6 @@ TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTaskBasic) {
 // posted at the exact same time. It would be nice if the API allowed us to
 // specify the desired run time.
 TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTasksSameDelay) {
-  // TODO(akalin): Remove this check (http://crbug.com/149144).
-  if (!this->delegate_.TaskRunnerHandlesNonZeroDelays()) {
-    DLOG(INFO) << "This SequencedTaskRunner doesn't handle "
-        "non-zero delays; skipping";
-    return;
-  }
-
   const int kTaskCount = 2;
   const TimeDelta kDelay = TimeDelta::FromMilliseconds(100);
 
@@ -299,13 +278,6 @@ TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTasksSameDelay) {
 // delayed task runs after the normal task even if the normal task takes
 // a long time to run.
 TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTaskAfterLongTask) {
-  // TODO(akalin): Remove this check (http://crbug.com/149144).
-  if (!this->delegate_.TaskRunnerHandlesNonZeroDelays()) {
-    DLOG(INFO) << "This SequencedTaskRunner doesn't handle "
-        "non-zero delays; skipping";
-    return;
-  }
-
   const int kTaskCount = 2;
 
   this->delegate_.StartTaskRunner();
@@ -327,13 +299,6 @@ TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTaskAfterLongTask) {
 // Test that a pile of normal tasks and a delayed task run in the
 // time-to-run order.
 TYPED_TEST_P(SequencedTaskRunnerTest, DelayedTaskAfterManyLongTasks) {
-  // TODO(akalin): Remove this check (http://crbug.com/149144).
-  if (!this->delegate_.TaskRunnerHandlesNonZeroDelays()) {
-    DLOG(INFO) << "This SequencedTaskRunner doesn't handle "
-        "non-zero delays; skipping";
-    return;
-  }
-
   const int kTaskCount = 11;
 
   this->delegate_.StartTaskRunner();
diff --git a/base/test/task_runner_test_template.h b/base/test/task_runner_test_template.h
index 2dd88144d6d5bf..73aa1f4a479f7d 100644
--- a/base/test/task_runner_test_template.h
+++ b/base/test/task_runner_test_template.h
@@ -30,11 +30,6 @@
 //     void StopTaskRunner() {
 //       ...
 //     }
-//
-//     // Returns whether or not the task runner obeys non-zero delays.
-//     bool TaskRunnerHandlesNonZeroDelays() const {
-//       return true;
-//     }
 //   };
 //
 // The TaskRunnerTest test harness will have a member variable of
@@ -141,11 +136,6 @@ TYPED_TEST_P(TaskRunnerTest, Basic) {
 // Post a bunch of delayed tasks to the task runner.  They should all
 // complete.
 TYPED_TEST_P(TaskRunnerTest, Delayed) {
-  if (!this->delegate_.TaskRunnerHandlesNonZeroDelays()) {
-    DLOG(INFO) << "This TaskRunner doesn't handle non-zero delays; skipping";
-    return;
-  }
-
   std::map<int, int> expected_task_run_counts;
   int expected_total_tasks = 0;
 
diff --git a/base/threading/sequenced_worker_pool_unittest.cc b/base/threading/sequenced_worker_pool_unittest.cc
index a07fd479095050..10cf28ba30d96a 100644
--- a/base/threading/sequenced_worker_pool_unittest.cc
+++ b/base/threading/sequenced_worker_pool_unittest.cc
@@ -832,10 +832,6 @@ class SequencedWorkerPoolTaskRunnerTestDelegate {
     // reference to the pool.
   }
 
-  bool TaskRunnerHandlesNonZeroDelays() const {
-    return true;
-  }
-
  private:
   MessageLoop message_loop_;
   scoped_ptr<SequencedWorkerPoolOwner> pool_owner_;
@@ -872,10 +868,6 @@ class SequencedWorkerPoolTaskRunnerWithShutdownBehaviorTestDelegate {
     // reference to the pool.
   }
 
-  bool TaskRunnerHandlesNonZeroDelays() const {
-    return true;
-  }
-
  private:
   MessageLoop message_loop_;
   scoped_ptr<SequencedWorkerPoolOwner> pool_owner_;
@@ -913,10 +905,6 @@ class SequencedWorkerPoolSequencedTaskRunnerTestDelegate {
     // reference to the pool.
   }
 
-  bool TaskRunnerHandlesNonZeroDelays() const {
-    return true;
-  }
-
  private:
   MessageLoop message_loop_;
   scoped_ptr<SequencedWorkerPoolOwner> pool_owner_;