Revert of Finish conversion to sk_sp<SkShader>

bench/ImageFilterCollapse.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 "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 48 matching lines @@
         fBitmap.allocN32Pixels(W, H);
         fBitmap.eraseColor(SK_ColorTRANSPARENT);
 
         SkCanvas canvas(fBitmap);
         SkPaint paint;
         SkPoint pts[] = { {0, 0}, {SkIntToScalar(W), SkIntToScalar(H)} };
         SkColor colors[] = {
             SK_ColorBLACK, SK_ColorGREEN, SK_ColorCYAN,
             SK_ColorRED, 0, SK_ColorBLUE, SK_ColorWHITE
         };
-        paint.setShader(SkGradientShader::MakeLinear(pts, colors, nullptr, SK_ARRAY_COUNT(colors),
-                                                     SkShader::kClamp_TileMode));
+        SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear(
+                    pts, colors, nullptr, SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode
+        ));
+        paint.setShader(shader);
         canvas.drawPaint(paint);
     }
 };
 
 class TableCollapseBench: public BaseImageFilterCollapseBench {
 public:
     virtual ~TableCollapseBench() {}
 
 protected:
     virtual const char* onGetName() override {
@@ skipping 66 matching lines @@
         doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters));
 
         for(unsigned i = 0; i < SK_ARRAY_COUNT(colorFilters); i++) {
             colorFilters[i]->unref();
         }
     }
 };
 
 DEF_BENCH(return new TableCollapseBench;)
 DEF_BENCH(return new MatrixCollapseBench;)