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

cc/test/skia_common.h

Index: cc/test/skia_common.h
diff --git a/cc/test/skia_common.h b/cc/test/skia_common.h
index 3ca97271debf19ffc020d31b4005eb42091ccd5c..bb924f4738f9491897171522aa5f4c6f3269ea99 100644
--- a/cc/test/skia_common.h
+++ b/cc/test/skia_common.h
@@ -8,9 +8,9 @@
 #include <memory>
 
 #include "base/memory/ref_counted.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace gfx {
 class Rect;
@@ -28,7 +28,7 @@ bool AreDisplayListDrawingResultsSame(const gfx::Rect& layer_rect,
                                       scoped_refptr<DisplayItemList> list_a,
                                       scoped_refptr<DisplayItemList> list_b);
 
-skia::RefPtr<SkImage> CreateDiscardableImage(const gfx::Size& size);
+sk_sp<SkImage> CreateDiscardableImage(const gfx::Size& size);
 
 }  // namespace cc