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

cc/playback/recording_source_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 <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/region.h"
 #include "cc/playback/raster_source.h"
 #include "cc/proto/recording_source.pb.h"
@@ skipping 83 matching lines @@
 
   ValidateRecordingSourceSerialization(recording_source.get());
 }
 
 TEST(RecordingSourceTest, DiscardableImagesWithTransform) {
   gfx::Rect recorded_viewport(256, 256);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(
           recorded_viewport.size());
-  skia::RefPtr<SkImage> discardable_image[2][2];
+  sk_sp<SkImage> discardable_image[2][2];
   gfx::Transform identity_transform;
   discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
   // Translate transform is equivalent to moving using point.
   gfx::Transform translate_transform;
   translate_transform.Translate(0, 130);
   discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32));
   // This moves the bitmap to center of viewport and rotate, this would make
   // this bitmap in all four tile grids.
   gfx::Transform rotate_transform;
   rotate_transform.Translate(112, 112);
@@ skipping 130 matching lines @@
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       CreateRecordingSource(recorded_viewport);
 
   SkPaint simple_paint;
   simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
 
   SkBitmap non_discardable_bitmap;
   non_discardable_bitmap.allocN32Pixels(128, 128);
   non_discardable_bitmap.setImmutable();
-  skia::RefPtr<SkImage> non_discardable_image =
-      skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap));
+  sk_sp<SkImage> non_discardable_image =
+      SkImage::MakeFromBitmap(non_discardable_bitmap);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
                                              simple_paint);
   recording_source->add_draw_rect_with_paint(gfx::Rect(128, 128, 512, 512),
                                              simple_paint);
   recording_source->add_draw_rect_with_paint(gfx::Rect(512, 0, 256, 256),
                                              simple_paint);
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256),
                                              simple_paint);
   recording_source->add_draw_image(non_discardable_image.get(),
@@ skipping 30 matching lines @@
     EXPECT_TRUE(images.empty());
   }
 }
 
 TEST(RecordingSourceTest, DiscardableImages) {
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       CreateRecordingSource(recorded_viewport);
 
-  skia::RefPtr<SkImage> discardable_image[2][2];
+  sk_sp<SkImage> discardable_image[2][2];
   discardable_image[0][0] = CreateDiscardableImage(gfx::Size(32, 32));
   discardable_image[1][0] = CreateDiscardableImage(gfx::Size(32, 32));
   discardable_image[1][1] = CreateDiscardableImage(gfx::Size(32, 32));
 
   // Discardable images are found in the following cells:
   // |---|---|
   // | x |   |
   // |---|---|
   // | x | x |
   // |---|---|
@@ skipping 49 matching lines @@
 
 TEST(RecordingSourceTest, DiscardableImagesBaseNonDiscardable) {
   gfx::Rect recorded_viewport(0, 0, 512, 512);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       CreateRecordingSource(recorded_viewport);
 
   SkBitmap non_discardable_bitmap;
   non_discardable_bitmap.allocN32Pixels(512, 512);
   non_discardable_bitmap.setImmutable();
-  skia::RefPtr<SkImage> non_discardable_image =
-      skia::AdoptRef(SkImage::NewFromBitmap(non_discardable_bitmap));
+  sk_sp<SkImage> non_discardable_image =
+      SkImage::MakeFromBitmap(non_discardable_bitmap);
 
-  skia::RefPtr<SkImage> discardable_image[2][2];
+  sk_sp<SkImage> discardable_image[2][2];
   discardable_image[0][0] = CreateDiscardableImage(gfx::Size(128, 128));
   discardable_image[0][1] = CreateDiscardableImage(gfx::Size(128, 128));
   discardable_image[1][1] = CreateDiscardableImage(gfx::Size(128, 128));
 
   // One large non-discardable image covers the whole grid.
   // Discardable images are found in the following cells:
   // |---|---|
   // | x | x |
   // |---|---|
   // |   | x |
@@ skipping 42 matching lines @@
                                               &images);
     EXPECT_EQ(3u, images.size());
     EXPECT_TRUE(images[0].image() == discardable_image[0][0].get());
     EXPECT_TRUE(images[1].image() == discardable_image[0][1].get());
     EXPECT_TRUE(images[2].image() == discardable_image[1][1].get());
   }
 }
 
 }  // namespace
 }  // namespace cc