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

cc/test/skia_common.cc

 // Copyright 2012 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/test/skia_common.h"
 
 #include <stddef.h>
 
 #include "cc/playback/display_item_list.h"
 #include "skia/ext/refptr.h"
@@ skipping 34 matching lines @@
   std::unique_ptr<unsigned char[]> pixels_a(new unsigned char[pixel_size]);
   std::unique_ptr<unsigned char[]> pixels_b(new unsigned char[pixel_size]);
   memset(pixels_a.get(), 0, pixel_size);
   memset(pixels_b.get(), 0, pixel_size);
   DrawDisplayList(pixels_a.get(), layer_rect, list_a);
   DrawDisplayList(pixels_b.get(), layer_rect, list_b);
 
   return !memcmp(pixels_a.get(), pixels_b.get(), pixel_size);
 }
 
-skia::RefPtr<SkImage> CreateDiscardableImage(const gfx::Size& size) {
+sk_sp<SkImage> CreateDiscardableImage(const gfx::Size& size) {
   const SkImageInfo info =
       SkImageInfo::MakeN32Premul(size.width(), size.height());
-  return skia::AdoptRef(
-      SkImage::NewFromGenerator(new TestImageGenerator(info)));
+  return SkImage::MakeFromGenerator(new TestImageGenerator(info));
 }
 
 }  // namespace cc