cc: Simplify Task and its derived classes.

cc/raster/tile_task_worker_pool_unittest.cc

Index: cc/raster/tile_task_worker_pool_unittest.cc
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc
index c2959f3c46e2e418a22657c13bcba5802171c75e..a5e26cdb0647fa8af6740a6bed9fa482acea15de 100644
--- a/cc/raster/tile_task_worker_pool_unittest.cc
+++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -23,7 +23,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/zero_copy_tile_task_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
@@ -53,16 +52,16 @@ enum TileTaskWorkerPoolType {
 
 class TileTaskWorkerPoolTest;
 
-class TestRasterTaskImpl : public RasterTask {
+class TestRasterTaskImpl : public Task {
  public:
   TestRasterTaskImpl(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)),
         raster_source_(FakeRasterSource::CreateFilled(gfx::Size(1, 1))) {
-    SetTaskTypeId(TASK_TYPE_RASTER);
+    SetTaskType(TASK_TYPE_RASTER);
   }
 
   // Overridden from Task:
@@ -90,7 +89,7 @@ class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
   BlockingTestRasterTaskImpl(std::unique_ptr<ScopedResource> resource,
                              std::unique_ptr<RasterBuffer> raster_buffer,
                              base::Lock* lock,
-                             ImageDecodeTask::Vector* dependencies)
+                             Task::Vector* dependencies)
       : TestRasterTaskImpl(std::move(resource),
                            std::move(raster_buffer),
                            dependencies),
@@ -119,7 +118,7 @@ class TileTaskWorkerPoolTest
     bool canceled;
   };
 
-  typedef std::vector<scoped_refptr<RasterTask>> RasterTaskVector;
+  typedef Task::Vector RasterTaskVector;
 
   enum NamedTaskSet { REQUIRED_FOR_ACTIVATION, REQUIRED_FOR_DRAW, ALL };
 
@@ -185,12 +184,12 @@ class TileTaskWorkerPoolTest
     for (auto task : completed_tasks) {
       // Don't process image decode tasks as there are no dependencies for
       // raster tasks in the tests.
-      if (task->GetTaskTypeId() == TASK_TYPE_RASTER) {
+      if (task->GetTaskType() == TASK_TYPE_RASTER) {
         TestRasterTaskImpl* raster_task =
             static_cast<TestRasterTaskImpl*>(task.get());
         RasterTaskCompleted(0, !raster_task->HasFinishedRunning());
       }
-      static_cast<TileTask*>(task.get())->DidComplete();
+      task->DidComplete();
     }
   }
 
@@ -219,7 +218,7 @@ class TileTaskWorkerPoolTest
     resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                        RGBA_8888);
 
-    ImageDecodeTask::Vector empty;
+    Task::Vector empty;
     std::unique_ptr<RasterBuffer> raster_buffer =
         tile_task_worker_pool_->AsRasterBufferProvider()
             ->AcquireBufferForRaster(resource.get(), 0, 0);
@@ -237,7 +236,7 @@ class TileTaskWorkerPoolTest
     resource->Allocate(size, ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                        RGBA_8888);
 
-    ImageDecodeTask::Vector empty;
+    Task::Vector empty;
     std::unique_ptr<RasterBuffer> raster_buffer =
         tile_task_worker_pool_->AsRasterBufferProvider()
             ->AcquireBufferForRaster(resource.get(), 0, 0);