cc: Remove RasterWorkerPool::Task.

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 200d1f0037a8ec56b0e3743c8b569bb164a0b23f..c279d2c1733931eccf2f37b1fc77d179b0508cb0 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -176,9 +176,10 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   void FreeResourceForTile(Tile* tile, RasterMode mode);
   void FreeResourcesForTile(Tile* tile);
   void FreeUnusedResourcesForTile(Tile* tile);
-  RasterWorkerPool::Task CreateImageDecodeTask(Tile* tile,
-                                               SkPixelRef* pixel_ref);
-  RasterWorkerPool::RasterTask CreateRasterTask(Tile* tile);
+  scoped_refptr<internal::WorkerPoolTask> CreateImageDecodeTask(
+      Tile* tile,
+      SkPixelRef* pixel_ref);
+  scoped_refptr<internal::RasterWorkerPoolTask> CreateRasterTask(Tile* tile);
   scoped_ptr<base::Value> GetMemoryRequirementsAsValue() const;
   void UpdatePrioritizedTileSetIfNeeded();
 
@@ -214,7 +215,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   bool did_initialize_visible_tile_;
   bool did_check_for_completed_tasks_since_last_schedule_tasks_;
 
-  typedef base::hash_map<uint32_t, RasterWorkerPool::Task> PixelRefTaskMap;
+  typedef base::hash_map<uint32_t, scoped_refptr<internal::WorkerPoolTask> >
+      PixelRefTaskMap;
   typedef base::hash_map<int, PixelRefTaskMap> LayerPixelRefTaskMap;
   LayerPixelRefTaskMap image_decode_tasks_;
 
@@ -228,8 +230,7 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient,
   bool use_rasterize_on_demand_;
 
   // Queues used when scheduling raster tasks.
-  RasterWorkerPool::RasterTask::Queue
-      raster_queue_[NUM_RASTER_WORKER_POOL_TYPES];
+  RasterTaskQueue raster_queue_[NUM_RASTER_WORKER_POOL_TYPES];
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };