Revert of cc: Move SkShader construction to a single spot in PaintShader

ui/gfx/skia_paint_util.cc

Index: ui/gfx/skia_paint_util.cc
diff --git a/ui/gfx/skia_paint_util.cc b/ui/gfx/skia_paint_util.cc
index 6bbe1ca94adc2da6bc9dc14e20fb8a309a92c2d9..dcaea71be1e1ea9e55fa1bd5a9c5cb507f5bd41c 100644
--- a/ui/gfx/skia_paint_util.cc
+++ b/ui/gfx/skia_paint_util.cc
@@ -4,7 +4,6 @@
 
 #include "ui/gfx/skia_paint_util.h"
 
-#include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
@@ -13,17 +12,16 @@
 
 namespace gfx {
 
-std::unique_ptr<cc::PaintShader> CreateImageRepShader(
-    const gfx::ImageSkiaRep& image_rep,
-    SkShader::TileMode tile_mode,
-    const SkMatrix& local_matrix) {
-  return CreateImageRepShaderForScale(image_rep, tile_mode, local_matrix,
-                                      image_rep.scale());
+sk_sp<cc::PaintShader> CreateImageRepShader(const gfx::ImageSkiaRep& image_rep,
+                                            cc::PaintShader::TileMode tile_mode,
+                                            const SkMatrix& local_matrix) {
+  return cc::WrapSkShader(CreateImageRepShaderForScale(
+      image_rep, tile_mode, local_matrix, image_rep.scale()));
 }
 
-std::unique_ptr<cc::PaintShader> CreateImageRepShaderForScale(
+sk_sp<cc::PaintShader> CreateImageRepShaderForScale(
     const gfx::ImageSkiaRep& image_rep,
-    SkShader::TileMode tile_mode,
+    cc::PaintShader::TileMode tile_mode,
     const SkMatrix& local_matrix,
     SkScalar scale) {
   // Unscale matrix by |scale| such that the bitmap is drawn at the
@@ -38,22 +36,21 @@
   shader_scale.setScaleX(local_matrix.getScaleX() / scale);
   shader_scale.setScaleY(local_matrix.getScaleY() / scale);
 
-  return cc::PaintShader::MakeImage(
-      SkImage::MakeFromBitmap(image_rep.sk_bitmap()), tile_mode, tile_mode,
-      &shader_scale);
+  return cc::PaintShader::MakeBitmapShader(image_rep.sk_bitmap(), tile_mode,
+                                           tile_mode, &shader_scale);
 }
 
-std::unique_ptr<cc::PaintShader> CreateGradientShader(int start_point,
-                                                      int end_point,
-                                                      SkColor start_color,
-                                                      SkColor end_color) {
+sk_sp<cc::PaintShader> CreateGradientShader(int start_point,
+                                            int end_point,
+                                            SkColor start_color,
+                                            SkColor end_color) {
   SkColor grad_colors[2] = {start_color, end_color};
   SkPoint grad_points[2];
   grad_points[0].iset(0, start_point);
   grad_points[1].iset(0, end_point);
 
-  return cc::PaintShader::MakeLinearGradient(grad_points, grad_colors, nullptr,
-                                             2, SkShader::kClamp_TileMode);
+  return cc::WrapSkShader(SkGradientShader::MakeLinear(
+      grad_points, grad_colors, NULL, 2, cc::PaintShader::kClamp_TileMode));
 }
 
 // This is copied from