cc: Simplify Task and its derived classes.

cc/raster/tile_task_worker_pool_perftest.cc

Index: cc/raster/tile_task_worker_pool_perftest.cc
diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc
index 159ec447fd1f5446a1195c59c85da72e9644666f..e4a923b853bf6fc605e3398c5027f8969bee7cc3 100644
--- a/cc/raster/tile_task_worker_pool_perftest.cc
+++ b/cc/raster/tile_task_worker_pool_perftest.cc
@@ -16,7 +16,6 @@
 #include "cc/raster/gpu_tile_task_worker_pool.h"
 #include "cc/raster/one_copy_tile_task_worker_pool.h"
 #include "cc/raster/synchronous_task_graph_runner.h"
-#include "cc/raster/tile_task_runner.h"
 #include "cc/raster/tile_task_worker_pool.h"
 #include "cc/raster/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
@@ -123,9 +122,9 @@ static const int kTimeLimitMillis = 2000;
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
-class PerfImageDecodeTaskImpl : public ImageDecodeTask {
+class PerfImageDecodeTaskImpl : public Task {
  public:
-  PerfImageDecodeTaskImpl() { SetTaskTypeId(TASK_TYPE_IMAGE_DECODE); }
+  PerfImageDecodeTaskImpl() { SetTaskType(TASK_TYPE_IMAGE_DECODE); }
 
   // Overridden from Task:
   void RunOnWorkerThread() override {}
@@ -142,15 +141,15 @@ class PerfImageDecodeTaskImpl : public ImageDecodeTask {
   DISALLOW_COPY_AND_ASSIGN(PerfImageDecodeTaskImpl);
 };
 
-class PerfRasterTaskImpl : public RasterTask {
+class PerfRasterTaskImpl : public Task {
  public:
   PerfRasterTaskImpl(std::unique_ptr<ScopedResource> resource,
                      std::unique_ptr<RasterBuffer> raster_buffer,
-                     ImageDecodeTask::Vector* dependencies)
-      : RasterTask(dependencies),
+                     Task::Vector* dependencies)
+      : Task(dependencies),
         resource_(std::move(resource)),
         raster_buffer_(std::move(raster_buffer)) {
-    SetTaskTypeId(TASK_TYPE_RASTER);
+    SetTaskType(TASK_TYPE_RASTER);
   }
 
   // Overridden from Task:
@@ -173,7 +172,7 @@ class PerfRasterTaskImpl : public RasterTask {
 
 class TileTaskWorkerPoolPerfTestBase : public RasterBufferProvider {
  public:
-  typedef std::vector<scoped_refptr<RasterTask>> RasterTaskVector;
+  typedef Task::Vector RasterTaskVector;
 
   enum NamedTaskSet { REQUIRED_FOR_ACTIVATION, REQUIRED_FOR_DRAW, ALL };
 
@@ -195,13 +194,13 @@ class TileTaskWorkerPoolPerfTestBase : public RasterBufferProvider {
   void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override {}
 
   void CreateImageDecodeTasks(unsigned num_image_decode_tasks,
-                              ImageDecodeTask::Vector* image_decode_tasks) {
+                              Task::Vector* image_decode_tasks) {
     for (unsigned i = 0; i < num_image_decode_tasks; ++i)
       image_decode_tasks->push_back(new PerfImageDecodeTaskImpl);
   }
 
   void CreateRasterTasks(unsigned num_raster_tasks,
-                         const ImageDecodeTask::Vector& image_decode_tasks,
+                         const Task::Vector& image_decode_tasks,
                          RasterTaskVector* raster_tasks) {
     const gfx::Size size(1, 1);
 
@@ -210,7 +209,7 @@ class TileTaskWorkerPoolPerfTestBase : public RasterBufferProvider {
           ScopedResource::Create(resource_provider_.get()));
       resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                          RGBA_8888);
-      ImageDecodeTask::Vector dependencies = image_decode_tasks;
+      Task::Vector dependencies = image_decode_tasks;
       scoped_ptr<RasterBuffer> raster_buffer =
           AcquireBufferForRaster(resource.get(), 0, 0);
       raster_tasks->push_back(new PerfRasterTaskImpl(
@@ -292,13 +291,13 @@ class TileTaskWorkerPoolPerfTest
     tile_task_worker_pool_->CollectCompletedTasks(&completed_tasks);
 
     for (auto task : completed_tasks) {
-      if (task->GetTaskTypeId() == TASK_TYPE_IMAGE_DECODE) {
+      if (task->GetTaskType() == TASK_TYPE_IMAGE_DECODE) {
         static_cast<PerfImageDecodeTaskImpl*>(task.get())->Reset();
-      } else if (task->GetTaskTypeId() == TASK_TYPE_RASTER) {
+      } else if (task->GetTaskType() == TASK_TYPE_RASTER) {
         static_cast<PerfRasterTaskImpl*>(task.get())->Reset();
       }
 
-      static_cast<TileTask*>(task.get())->DidComplete();
+      task->DidComplete();
     }
     completed_tasks.clear();
   }
@@ -316,7 +315,7 @@ class TileTaskWorkerPoolPerfTest
   void RunScheduleTasksTest(const std::string& test_name,
                             unsigned num_raster_tasks,
                             unsigned num_image_decode_tasks) {
-    ImageDecodeTask::Vector image_decode_tasks;
+    Task::Vector image_decode_tasks;
     RasterTaskVector raster_tasks;
     CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks);
     CreateRasterTasks(num_raster_tasks, image_decode_tasks, &raster_tasks);
@@ -345,7 +344,7 @@ class TileTaskWorkerPoolPerfTest
                                      unsigned num_raster_tasks,
                                      unsigned num_image_decode_tasks) {
     const size_t kNumVersions = 2;
-    ImageDecodeTask::Vector image_decode_tasks[kNumVersions];
+    Task::Vector image_decode_tasks[kNumVersions];
     RasterTaskVector raster_tasks[kNumVersions];
     for (size_t i = 0; i < kNumVersions; ++i) {
       CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks[i]);
@@ -378,7 +377,7 @@ class TileTaskWorkerPoolPerfTest
   void RunScheduleAndExecuteTasksTest(const std::string& test_name,
                                       unsigned num_raster_tasks,
                                       unsigned num_image_decode_tasks) {
-    ImageDecodeTask::Vector image_decode_tasks;
+    Task::Vector image_decode_tasks;
     RasterTaskVector raster_tasks;
     CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks);
     CreateRasterTasks(num_raster_tasks, image_decode_tasks, &raster_tasks);
@@ -487,7 +486,7 @@ class TileTaskWorkerPoolCommonPerfTest : public TileTaskWorkerPoolPerfTestBase,
   void RunBuildTileTaskGraphTest(const std::string& test_name,
                                  unsigned num_raster_tasks,
                                  unsigned num_image_decode_tasks) {
-    ImageDecodeTask::Vector image_decode_tasks;
+    Task::Vector image_decode_tasks;
     RasterTaskVector raster_tasks;
     CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks);
     CreateRasterTasks(num_raster_tasks, image_decode_tasks, &raster_tasks);