Replace many skia::RefPtr with sk_sp<> in cc/

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 {
 namespace {
 
-skia::RefPtr<SkImage> CreateImage(int width, int height) {
+sk_sp<SkImage> CreateImage(int width, int height) {
   SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
   SkBitmap bitmap;
   bitmap.allocPixels(info);
-  return skia::AdoptRef(SkImage::NewFromBitmap(bitmap));
+  return SkImage::MakeFromBitmap(bitmap);
 }
 
 SkMatrix CreateMatrix(const SkSize& scale, bool is_decomposable) {
   SkMatrix matrix;
   matrix.setScale(scale.width(), scale.height());
 
   if (!is_decomposable) {
     // Perspective is not decomposable, add it.
     matrix[SkMatrix::kMPersp0] = 0.1f;
   }
 
   return matrix;
 }
 
 TEST(SoftwareImageDecodeControllerTest, ImageKeyLowQuality) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality qualities[] = {kNone_SkFilterQuality, kLow_SkFilterQuality};
   for (auto quality : qualities) {
     DrawImage draw_image(
         image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
         CreateMatrix(SkSize::Make(0.5f, 1.5f), is_decomposable));
 
     auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
     EXPECT_EQ(image->uniqueID(), key.image_id());
     EXPECT_EQ(quality, key.filter_quality());
     EXPECT_EQ(100, key.target_size().width());
     EXPECT_EQ(100, key.target_size().height());
     EXPECT_TRUE(key.can_use_original_decode());
     // Since the original decode will be used, the locked_bytes is that of the
     // original image.
     EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
   }
 }
 
 TEST(SoftwareImageDecodeControllerTest, ImageKeyMediumQuality) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kMedium_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 1.5f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(quality, key.filter_quality());
   EXPECT_EQ(50, key.target_size().width());
   EXPECT_EQ(150, key.target_size().height());
   EXPECT_FALSE(key.can_use_original_decode());
   EXPECT_EQ(50u * 150u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyMediumQualityDropToLowIfEnlarging) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kMedium_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.5f, 1.5f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyMediumQualityDropToLowIfIdentity) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kMedium_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyMediumQualityDropToLowIfNearlyIdentity) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kMedium_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.001f, 1.001f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyMediumQualityDropToLowIfNearlyIdentity2) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kMedium_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.999f, 0.999f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyMediumQualityDropToLowIfNotDecomposable) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = false;
   SkFilterQuality quality = kMedium_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 1.5f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest, ImageKeyHighQuality) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 1.5f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(quality, key.filter_quality());
   EXPECT_EQ(50, key.target_size().width());
   EXPECT_EQ(150, key.target_size().height());
   EXPECT_FALSE(key.can_use_original_decode());
   EXPECT_EQ(50u * 150u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyHighQualityDropToMediumIfTooLarge) {
   // Just over 64MB when scaled.
-  skia::RefPtr<SkImage> image = CreateImage(4555, 2048);
+  sk_sp<SkImage> image = CreateImage(4555, 2048);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   // At least one dimension should scale down, so that medium quality doesn't
   // become low.
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.9f, 2.f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kMedium_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(4100, key.target_size().width());
   EXPECT_EQ(4096, key.target_size().height());
   EXPECT_FALSE(key.can_use_original_decode());
   EXPECT_EQ(4100u * 4096u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyHighQualityDropToLowIfNotDecomposable) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = false;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 1.5f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyHighQualityDropToLowIfIdentity) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyHighQualityDropToLowIfNearlyIdentity) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(1.001f, 1.001f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageKeyHighQualityDropToLowIfNearlyIdentity2) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.999f, 0.999f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_TRUE(key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest, OriginalDecodesAreEqual) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kLow_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeWH(image->width(), image->height()), quality,
       CreateMatrix(SkSize::Make(0.5f, 0.5), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
@@ skipping 12 matching lines @@
   EXPECT_EQ(kLow_SkFilterQuality, another_key.filter_quality());
   EXPECT_EQ(100, another_key.target_size().width());
   EXPECT_EQ(100, another_key.target_size().height());
   EXPECT_TRUE(another_key.can_use_original_decode());
   EXPECT_EQ(100u * 100u * 4u, another_key.locked_bytes());
 
   EXPECT_TRUE(key == another_key);
 }
 
 TEST(SoftwareImageDecodeControllerTest, ImageRectDoesNotContainSrcRect) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeXYWH(25, 35, image->width(), image->height()),
       quality, CreateMatrix(SkSize::Make(1.f, 1.f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kLow_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(100, key.target_size().width());
   EXPECT_EQ(100, key.target_size().height());
   EXPECT_EQ(gfx::Rect(25, 35, 75, 65), key.src_rect());
   EXPECT_EQ(100u * 100u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      ImageRectDoesNotContainSrcRectWithScale) {
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<SkImage> image = CreateImage(100, 100);
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
   DrawImage draw_image(
       image.get(), SkIRect::MakeXYWH(20, 30, image->width(), image->height()),
       quality, CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable));
 
   auto key = ImageDecodeControllerKey::FromDrawImage(draw_image);
   EXPECT_EQ(image->uniqueID(), key.image_id());
   EXPECT_EQ(kHigh_SkFilterQuality, key.filter_quality());
   EXPECT_EQ(40, key.target_size().width());
   EXPECT_EQ(35, key.target_size().height());
   EXPECT_EQ(gfx::Rect(20, 30, 80, 70), key.src_rect());
   EXPECT_EQ(40u * 35u * 4u, key.locked_bytes());
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetTaskForImageSameImage) {
   SoftwareImageDecodeController controller;
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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;
   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;
   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);
+  sk_sp<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;
   bool need_unref = controller.GetTaskForImageAndRef(
       high_quality_draw_image, prepare_tiles_id, &high_quality_task);
@@ skipping 25 matching lines @@
   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);
+  sk_sp<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;
   bool need_unref = controller.GetTaskForImageAndRef(
       half_size_draw_image, prepare_tiles_id, &half_size_task);
@@ skipping 13 matching lines @@
   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);
+  sk_sp<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;
   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);
+  sk_sp<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;
   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);
+  sk_sp<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;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
@@ skipping 14 matching lines @@
   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);
+  sk_sp<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;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
@@ skipping 21 matching lines @@
   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);
+  sk_sp<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;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
@@ skipping 26 matching lines @@
   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);
+  sk_sp<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;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
@@ skipping 25 matching lines @@
   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);
+  sk_sp<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;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
@@ skipping 21 matching lines @@
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetDecodedImageForDrawWithNonContainedSrcRect) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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;
   bool need_unref =
       controller.GetTaskForImageAndRef(draw_image, prepare_tiles_id, &task);
   EXPECT_TRUE(need_unref);
   EXPECT_TRUE(task);
 
   task->WillSchedule();
@@ skipping 19 matching lines @@
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, GetDecodedImageForDrawAtRasterDecode) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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));
 
   DecodedDrawImage decoded_draw_image =
       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());
 
   controller.DrawWithImageFinished(draw_image, decoded_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetDecodedImageForDrawAtRasterDecodeMultipleTimes) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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));
 
   DecodedDrawImage decoded_draw_image =
       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());
@@ skipping 11 matching lines @@
   controller.DrawWithImageFinished(draw_image, another_decoded_draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetDecodedImageForDrawAtRasterDecodeDoesNotPreventTasks) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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));
 
   DecodedDrawImage decoded_draw_image =
       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());
@@ skipping 33 matching lines @@
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest,
      GetDecodedImageForDrawAtRasterDecodeIsUsedForLockedCache) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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));
 
   DecodedDrawImage decoded_draw_image =
       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());
@@ skipping 33 matching lines @@
   controller.DrawWithImageFinished(draw_image, another_decoded_draw_image);
   controller.UnrefImage(draw_image);
 }
 
 TEST(SoftwareImageDecodeControllerTest, ZeroSizedImagesAreSkipped) {
   SoftwareImageDecodeController controller;
   bool is_decomposable = true;
   uint64_t prepare_tiles_id = 1;
   SkFilterQuality quality = kHigh_SkFilterQuality;
 
-  skia::RefPtr<SkImage> image = CreateImage(100, 100);
+  sk_sp<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;
   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);
+  sk_sp<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;
   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);
+  sk_sp<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;
   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);
+  sk_sp<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;
   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);
+  sk_sp<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;
   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