Reland of "Finish conversion to sk_sp<SkShader> (patchset #2 id:20001 of https://codereview.chromiu…

bench/ColorCubeBench.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 "SkColorCubeFilter.h"
 #include "SkGradientShader.h"
@@ skipping 30 matching lines @@
 
     void onDraw(int loops, SkCanvas* canvas) override {
         this->test(loops, canvas);
     }
 
     SkIPoint onGetSize() override {
         return SkIPoint::Make(fSize.width(), fSize.height());
     }
 
 private:
-    static SkShader* MakeLinear(const SkISize& size) {
+    static sk_sp<SkShader> MakeLinear(const SkISize& size) {
         const SkPoint pts[2] = {
                 { 0, 0 },
                 { SkIntToScalar(size.width()), SkIntToScalar(size.height()) }
             };
         static const SkColor colors[] = { SK_ColorYELLOW, SK_ColorBLUE };
-        return SkGradientShader::CreateLinear(
+        return SkGradientShader::MakeLinear(
             pts, colors, nullptr, 2, SkShader::kRepeat_TileMode, 0, &SkMatrix::I());
     }
 
     void make_bitmap() {
         fBitmap.allocN32Pixels(fSize.width(), fSize.height());
         SkCanvas canvas(fBitmap);
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
-        SkShader* shader = MakeLinear(fSize);
-        paint.setShader(shader);
+        paint.setShader(MakeLinear(fSize));
         SkRect r = { 0, 0, SkIntToScalar(fSize.width()), SkIntToScalar(fSize.height()) };
         canvas.drawRect(r, paint);
-        shader->unref();
     }
 
     void makeCubeData() {
         fCubeDimension = 32;
         fCubeData = SkData::NewUninitialized(sizeof(SkColor) *
             fCubeDimension * fCubeDimension * fCubeDimension);
         SkColor* pixels = (SkColor*)(fCubeData->writable_data());
         SkAutoTMalloc<uint8_t> lutMemory(fCubeDimension);
         uint8_t* lut = lutMemory.get();
         const int maxIndex = fCubeDimension - 1;
@@ skipping 21 matching lines @@
             canvas->drawBitmap(fBitmap, 0, 0, &paint);
         }
     }
 
     typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new ColorCubeBench(); )