cc: Simplify task and its derived classes.

cc/tiles/software_image_decode_controller_unittest.cc

 // 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.
 
 #include "cc/tiles/software_image_decode_controller.h"
 
 #include "cc/playback/draw_image.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
@@ skipping 341 matching lines @@
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageSameImage) {
   SoftwareImageDecodeController controller;
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
   uint64_t prepare_tiles_id = 1;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   DrawImage another_draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> another_task;
+  scoped_refptr<DependencyTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(
       another_draw_image, prepare_tiles_id, &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task.get() == another_task.get());
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetTaskForImageSameImageDifferentQuality) {
   SoftwareImageDecodeController controller;
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
 
   DrawImage high_quality_draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()),
       kHigh_SkFilterQuality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> high_quality_task;
+  scoped_refptr<DependencyTask> high_quality_task;
   bool need_unref = controller.GetTaskForImageAndRef(
       high_quality_draw_image, prepare_tiles_id, &high_quality_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(high_quality_task);
 
   DrawImage medium_quality_draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()),
       kMedium_SkFilterQuality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> medium_quality_task;
+  scoped_refptr<DependencyTask> medium_quality_task;
   need_unref = controller.GetTaskForImageAndRef(
       medium_quality_draw_image, prepare_tiles_id, &medium_quality_task);
   // Medium quality isn't handled by the controller, so it won't ref it. Note
   // that this will change when medium quality is handled and will need to be
   // updated.
   EXPECT_FALSE(need_unref);
   EXPECT_TRUE(medium_quality_task);
   EXPECT_TRUE(high_quality_task.get() != medium_quality_task.get());
 
   DrawImage low_quality_draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()),
       kLow_SkFilterQuality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> low_quality_task;
+  scoped_refptr<DependencyTask> low_quality_task;
   need_unref = controller.GetTaskForImageAndRef(
       low_quality_draw_image, prepare_tiles_id, &low_quality_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(low_quality_task);
   EXPECT_TRUE(high_quality_task.get() != low_quality_task.get());
   EXPECT_TRUE(medium_quality_task.get() != low_quality_task.get());
 
   controller.UnrefImage(high_quality_draw_image);
   controller.UnrefImage(low_quality_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageSameImageDifferentSize) {
   SoftwareImageDecodeController controller;
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage half_size_draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> half_size_task;
+  scoped_refptr<DependencyTask> half_size_task;
   bool need_unref = controller.GetTaskForImageAndRef(
       half_size_draw_image, prepare_tiles_id, &half_size_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(half_size_task);
 
   DrawImage quarter_size_draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.25f, 0.25f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> quarter_size_task;
+  scoped_refptr<DependencyTask> quarter_size_task;
   need_unref = controller.GetTaskForImageAndRef(
       quarter_size_draw_image, prepare_tiles_id, &quarter_size_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(quarter_size_task);
   EXPECT_TRUE(half_size_task.get() != quarter_size_task.get());
 
   controller.UnrefImage(half_size_draw_image);
   controller.UnrefImage(quarter_size_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageDifferentImage) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> first_image = CreateImage(100, 100);
   DrawImage first_draw_image(
       first_image.get(),
       SkIRect::MakeWH(first_image->width(), first_image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> first_task;
+  scoped_refptr<DependencyTask> first_task;
   bool need_unref = controller.GetTaskForImageAndRef(
       first_draw_image, prepare_tiles_id, &first_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(first_task);
 
   skia::RefPtr<SkImage> second_image = CreateImage(100, 100);
   DrawImage second_draw_image(
       second_image.get(),
       SkIRect::MakeWH(second_image->width(), second_image->height()), quality,
       CreateMatrix(SkSize::Make(0.25f, 0.25f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> second_task;
+  scoped_refptr<DependencyTask> second_task;
   need_unref = controller.GetTaskForImageAndRef(second_draw_image,
                                                 prepare_tiles_id, &second_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(second_task);
   EXPECT_TRUE(first_task.get() != second_task.get());
 
   controller.UnrefImage(first_draw_image);
   controller.UnrefImage(second_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageAlreadyDecoded) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
   task->RunOnWorkerThread();
 
-  scoped_refptr<ImageDecodeTask> another_task;
+  scoped_refptr<DependencyTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(another_task);
 
   task->WillComplete();
   task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageAlreadyPrerolled) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kLow_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
   task->RunOnWorkerThread();
 
-  scoped_refptr<ImageDecodeTask> another_task;
+  scoped_refptr<DependencyTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(another_task);
 
   task->WillComplete();
   task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
-  scoped_refptr<ImageDecodeTask> third_task;
+  scoped_refptr<DependencyTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_FALSE(third_task);
 
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageCanceledGetsNewTask) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
 
-  scoped_refptr<ImageDecodeTask> another_task;
+  scoped_refptr<DependencyTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task.get() == task.get());
 
   // Didn't run the task, complete it (it was canceled).
   task->WillComplete();
   task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   // Fully cancel everything (so the raster would unref things).
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 
   // Here a new task is created.
-  scoped_refptr<ImageDecodeTask> third_task;
+  scoped_refptr<DependencyTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(third_task);
   EXPECT_FALSE(third_task.get() == task.get());
 
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetTaskForImageCanceledWhileReffedGetsNewTask) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
 
-  scoped_refptr<ImageDecodeTask> another_task;
+  scoped_refptr<DependencyTask> another_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &another_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(another_task.get() == task.get());
 
   // Didn't run the task, complete it (it was canceled).
   task->WillComplete();
   task->CompleteOnOriginThread(nullptr);
   task->DidComplete();
 
   // Note that here, everything is reffed, but a new task is created. This is
   // possible with repeated schedule/cancel operations.
-  scoped_refptr<ImageDecodeTask> third_task;
+  scoped_refptr<DependencyTask> third_task;
   need_unref = controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id,
                                                 &third_task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(third_task);
   EXPECT_FALSE(third_task.get() == task.get());
 
   // 3 Unrefs!
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetDecodedImageForDraw) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
 
   task->RunOnWorkerThread();
@@ skipping 21 matching lines @@
      GetDecodedImageForDrawWithNonContainedSrcRect) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeXYWH(20, 30, image->width(), image->height()),
       quality, CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
 
   task->RunOnWorkerThread();
@@ skipping 88 matching lines @@
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   EXPECT_EQ(50, decoded_draw_image.image()->width());
   EXPECT_EQ(50, decoded_draw_image.image()->height());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().width());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().height());
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_FALSE(decoded_draw_image.is_scale_adjustment_identity());
   EXPECT_TRUE(decoded_draw_image.is_at_raster_decode());
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
 
   task->RunOnWorkerThread();
@@ skipping 33 matching lines @@
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   EXPECT_EQ(50, decoded_draw_image.image()->width());
   EXPECT_EQ(50, decoded_draw_image.image()->height());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().width());
   EXPECT_FLOAT_EQ(0.5f, decoded_draw_image.scale_adjustment().height());
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_FALSE(decoded_draw_image.is_scale_adjustment_identity());
   EXPECT_TRUE(decoded_draw_image.is_at_raster_decode());
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
   task->ScheduleOnOriginThread(nullptr);
   task->DidSchedule();
 
   // If we finish the draw here, then we will use it for the locked decode
@@ skipping 22 matching lines @@
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.f, 0.f), is_decomposable));
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_FALSE(task);
   EXPECT_FALSE(need_unref);
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_FALSE(decoded_draw_image.image());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, NonOverlappingSrcRectImagesAreSkipped) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeXYWH(150, 150, image->width(), image->height()),
       quality, CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_FALSE(task);
   EXPECT_FALSE(need_unref);
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_FALSE(decoded_draw_image.image());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, LowQualityFilterIsHandled) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kLow_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(task);
   EXPECT_TRUE(need_unref);
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   // If we decoded the image and cached it, it would be stored in a different
   // SkImage object.
   EXPECT_TRUE(decoded_draw_image.image() != image.get());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, LowQualityScaledSubrectIsHandled) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kLow_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image.get(), SkIRect::MakeXYWH(10, 10, 80, 80), quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(task);
   EXPECT_TRUE(need_unref);
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   // If we decoded the image and cached it, it would be stored in a different
   // SkImage object.
   EXPECT_TRUE(decoded_draw_image.image() != image.get());
   EXPECT_EQ(kLow_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_TRUE(decoded_draw_image.is_scale_adjustment_identity());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, NoneQualityScaledSubrectIsHandled) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kNone_SkFilterQuality;
 
   skia::RefPtr<SkImage> image = CreateImage(100, 100);
   DrawImage draw_image(image.get(), SkIRect::MakeXYWH(10, 10, 80, 80), quality,
                        CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
 
-  scoped_refptr<ImageDecodeTask> task;
+  scoped_refptr<DependencyTask> task;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(task);
   EXPECT_TRUE(need_unref);
 
   DecodedDrawImage decoded_draw_image =
       controller.GetDecodedImageForDraw(draw_image);
   EXPECT_TRUE(decoded_draw_image.image());
   // If we decoded the image and cached it, it would be stored in a different
   // SkImage object.
   EXPECT_TRUE(decoded_draw_image.image() != image.get());
   EXPECT_EQ(kNone_SkFilterQuality, decoded_draw_image.filter_quality());
   EXPECT_TRUE(decoded_draw_image.is_scale_adjustment_identity());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
   controller.UnrefImage(draw_image);
 }
 }  // namespace
 }  // namespace cc