cc: Remove RasterWorkerPool::Task.

cc/resources/raster_worker_pool_unittest.cc

Index: cc/resources/raster_worker_pool_unittest.cc
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
index 4170a7a0790d067c9b002bf8090fe9b147d5b124..7f4b2cd57556021442ddeb870485e55c8f4927d5 100644
--- a/cc/resources/raster_worker_pool_unittest.cc
+++ b/cc/resources/raster_worker_pool_unittest.cc
@@ -113,39 +113,15 @@ class RasterWorkerPoolTest
     : public testing::TestWithParam<RasterWorkerPoolType>,
       public RasterWorkerPoolClient {
  public:
-  class RasterTask : public RasterWorkerPool::RasterTask {
-   public:
-    typedef std::vector<RasterTask> Vector;
-
-    static RasterTask Create(const Resource* resource,
-                             const TestRasterWorkerPoolTaskImpl::Reply& reply) {
-      internal::WorkerPoolTask::Vector dependencies;
-      return RasterTask(
-          new TestRasterWorkerPoolTaskImpl(resource, reply, &dependencies));
-    }
-
-    static RasterTask CreateBlocking(
-        const Resource* resource,
-        const TestRasterWorkerPoolTaskImpl::Reply& reply,
-        base::Lock* lock) {
-      internal::WorkerPoolTask::Vector dependencies;
-      return RasterTask(new BlockingTestRasterWorkerPoolTaskImpl(
-          resource, reply, lock, &dependencies));
-    }
-
-   private:
-    friend class RasterWorkerPoolTest;
-
-    explicit RasterTask(internal::RasterWorkerPoolTask* task)
-        : RasterWorkerPool::RasterTask(task) {}
-  };
-
   struct RasterTaskResult {
     unsigned id;
     bool canceled;
     RasterThread raster_thread;
   };
 
+  typedef std::vector<scoped_refptr<internal::RasterWorkerPoolTask> >
+      RasterTaskVector;
+
   RasterWorkerPoolTest()
       : context_provider_(TestContextProvider::Create()),
         timeout_seconds_(5),
@@ -212,11 +188,12 @@ class RasterWorkerPoolTest
   }
 
   void ScheduleTasks() {
-    RasterWorkerPool::RasterTask::Queue queue;
+    RasterTaskQueue queue;
 
-    for (RasterTask::Vector::iterator it = tasks_.begin(); it != tasks_.end();
+    for (RasterTaskVector::const_iterator it = tasks_.begin();
+         it != tasks_.end();
          ++it)
-      queue.Append(*it, false);
+      queue.items.push_back(RasterTaskQueue::Item(*it, false));
 
     raster_worker_pool_->ScheduleTasks(&queue);
   }
@@ -229,12 +206,14 @@ class RasterWorkerPoolTest
     resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
     const Resource* const_resource = resource.get();
 
-    tasks_.push_back(
-        RasterTask::Create(const_resource,
-                           base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
-                                      base::Unretained(this),
-                                      base::Passed(&resource),
-                                      id)));
+    internal::WorkerPoolTask::Vector empty;
+    tasks_.push_back(new TestRasterWorkerPoolTaskImpl(
+        const_resource,
+        base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
+                   base::Unretained(this),
+                   base::Passed(&resource),
+                   id),
+        &empty));
   }
 
   void AppendBlockingTask(unsigned id, base::Lock* lock) {
@@ -245,13 +224,15 @@ class RasterWorkerPoolTest
     resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
     const Resource* const_resource = resource.get();
 
-    tasks_.push_back(RasterTask::CreateBlocking(
+    internal::WorkerPoolTask::Vector empty;
+    tasks_.push_back(new BlockingTestRasterWorkerPoolTaskImpl(
         const_resource,
         base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
                    base::Unretained(this),
                    base::Passed(&resource),
                    id),
-        lock));
+        lock,
+        &empty));
   }
 
   const std::vector<RasterTaskResult>& completed_tasks() const {
@@ -285,7 +266,7 @@ class RasterWorkerPoolTest
   base::CancelableClosure timeout_;
   int timeout_seconds_;
   bool timed_out_;
-  std::vector<RasterTask> tasks_;
+  RasterTaskVector tasks_;
   std::vector<RasterTaskResult> completed_tasks_;
 };