cc: Simplify task and its derived classes.

cc/test/task_graph_runner_test_template.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TEST_TASK_GRAPH_RUNNER_TEST_TEMPLATE_H_
 #define CC_TEST_TASK_GRAPH_RUNNER_TEST_TEMPLATE_H_
 
 #include "cc/raster/task_graph_runner.h"
 
 #include <vector>
@@ skipping 37 matching lines @@
   void RunAllTasks(int namespace_index);
   void RunTaskOnWorkerThread(int namespace_index, unsigned id);
   void OnTaskCompleted(int namespace_index, unsigned id);
   const std::vector<unsigned>& run_task_ids(int namespace_index);
   const std::vector<unsigned>& on_task_completed_ids(int namespace_index);
   void ScheduleTasks(int namespace_index, const std::vector<TaskInfo>& tasks);
 
   static const int kNamespaceCount = 3;
 
  protected:
-  class FakeTaskImpl : public Task {
+  class FakeTaskImpl : public DependencyTask {
    public:
     FakeTaskImpl(TaskGraphRunnerTestBase* test, int namespace_index, int id)
         : test_(test), namespace_index_(namespace_index), id_(id) {}
 
     // Overridden from Task:
     void RunOnWorkerThread() override;
-
-    virtual void CompleteOnOriginThread();
+    void ScheduleOnOriginThread(DependencyTaskClient* client) override{};
+    void CompleteOnOriginThread(DependencyTaskClient* client) override;
 
    protected:
     ~FakeTaskImpl() override {}
 
    private:
     TaskGraphRunnerTestBase* test_;
     int namespace_index_;
     int id_;
 
     DISALLOW_COPY_AND_ASSIGN(FakeTaskImpl);
   };
 
   class FakeDependentTaskImpl : public FakeTaskImpl {
    public:
     FakeDependentTaskImpl(TaskGraphRunnerTestBase* test,
                           int namespace_index,
                           int id)
         : FakeTaskImpl(test, namespace_index, id) {}
 
     // Overridden from FakeTaskImpl:
-    void CompleteOnOriginThread() override {}
+    void CompleteOnOriginThread(DependencyTaskClient* client) override {}
 
    private:
     ~FakeDependentTaskImpl() override {}
 
     DISALLOW_COPY_AND_ASSIGN(FakeDependentTaskImpl);
   };
 
   TaskGraphRunner* task_graph_runner_;
   NamespaceToken namespace_token_[kNamespaceCount];
-  Task::Vector tasks_[kNamespaceCount];
-  Task::Vector dependents_[kNamespaceCount];
+  DependencyTask::Vector tasks_[kNamespaceCount];
+  DependencyTask::Vector dependents_[kNamespaceCount];
   std::vector<unsigned> run_task_ids_[kNamespaceCount];
   base::Lock run_task_ids_lock_;
   std::vector<unsigned> on_task_completed_ids_[kNamespaceCount];
 };
 
 template <typename TaskRunnerTestDelegate>
 class TaskGraphRunnerTest : public TaskGraphRunnerTestBase,
                             public testing::Test {
  public:
   // Overridden from testing::Test:
@@ skipping 182 matching lines @@
     EXPECT_EQ(1u, this->on_task_completed_ids(i)[0]);
     EXPECT_EQ(0u, this->on_task_completed_ids(i)[1]);
   }
 }
 
 REGISTER_TYPED_TEST_CASE_P(SingleThreadTaskGraphRunnerTest, Priority);
 
 }  // namespace cc
 
 #endif  // CC_TEST_TASK_GRAPH_RUNNER_TEST_TEMPLATE_H_