Revert of Finish conversion to sk_sp<SkShader>

bench/PatchGridBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 132 matching lines @@
                         fGrid.setPatch(j, i, points, colors, texs);
                         break;
                     default:
                         break;
                 }
             }
         }
     }
     
     // override this method to change the shader
-    sk_sp<SkShader> createShader() {
+    SkShader* createShader() {
         const SkColor colors[] = {
             SK_ColorRED, SK_ColorCYAN, SK_ColorGREEN, SK_ColorWHITE,
             SK_ColorMAGENTA, SK_ColorBLUE, SK_ColorYELLOW,
         };
         const SkPoint pts[] = { { 200.f / 4.f, 0.f }, { 3.f * 200.f / 4, 200.f } };
         
-        return SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors),
-                                            SkShader::kMirror_TileMode);
+        return SkGradientShader::CreateLinear(pts, colors, nullptr,
+                                              SK_ARRAY_COUNT(colors),
+                                              SkShader::kMirror_TileMode);
     }
 
 protected:
     const char* onGetName() override {
         SkString vertexMode;
         switch (fVertexMode) {
             case kNone_VertexMode:
                 vertexMode.set("meshlines");
                 break;
             case kColors_VertexMode:
@@ skipping 25 matching lines @@
         }
         fName.printf("patch_grid_%s_%s", vertexMode.c_str(), size.c_str());
         return fName.c_str();
     }
     
     void onDelayedSetup() override {
         this->setGrid();
         switch (fVertexMode) {
             case kTexCoords_VertexMode:
             case kBoth_VertexMode:
-                fPaint.setShader(createShader());
+                fPaint.setShader(createShader())->unref();
                 break;
             default:
                 fPaint.setShader(nullptr);
                 break;
         }
         this->setupPaint(&fPaint);
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         this->setScale(canvas);
@@ skipping 31 matching lines @@
 DEF_BENCH( return new PatchGridBench(PatchGridBench::kMedium_Size,
                                      PatchGridBench::kBoth_VertexMode); )
 DEF_BENCH( return new PatchGridBench(PatchGridBench::kBig_Size,
                                      PatchGridBench::kNone_VertexMode); )
 DEF_BENCH( return new PatchGridBench(PatchGridBench::kBig_Size,
                                      PatchGridBench::kColors_VertexMode); )
 DEF_BENCH( return new PatchGridBench(PatchGridBench::kBig_Size,
                                      PatchGridBench::kTexCoords_VertexMode); )
 DEF_BENCH( return new PatchGridBench(PatchGridBench::kBig_Size,
                                      PatchGridBench::kBoth_VertexMode); )