Revert of more shader-->sp conversions

gm/imagefilterscropexpand.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
@@ skipping 133 matching lines @@
     static SkImage* MakeGradientCircle(int width, int height) {
         SkScalar x = SkIntToScalar(width / 2);
         SkScalar y = SkIntToScalar(height / 2);
         SkScalar radius = SkMinScalar(x, y) * 0.8f;
         SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(width, height));
         SkCanvas* canvas = surface->getCanvas();
         canvas->clear(0x00000000);
         SkColor colors[2];
         colors[0] = SK_ColorWHITE;
         colors[1] = SK_ColorBLACK;
+        SkAutoTUnref<SkShader> shader(
+            SkGradientShader::CreateRadial(SkPoint::Make(x, y), radius, colors, nullptr, 2,
+                                           SkShader::kClamp_TileMode)
+        );
         SkPaint paint;
-        paint.setShader(SkGradientShader::MakeRadial(SkPoint::Make(x, y), radius, colors, nullptr,
-                                                     2, SkShader::kClamp_TileMode));
+        paint.setShader(shader);
         canvas->drawCircle(x, y, radius, paint);
 
         return surface->newImageSnapshot();
     }
 
     static void Draw(SkCanvas* canvas, const SkBitmap& bitmap, const SkRect& rect, SkImageFilter* filter) {
         SkPaint paint;
         paint.setImageFilter(filter)->unref();
         canvas->saveLayer(&rect, &paint);
         canvas->drawBitmap(bitmap, 0, 0);
         canvas->restore();
 
         SkPaint strokePaint;
         strokePaint.setColor(0xFFFF0000);
         strokePaint.setStyle(SkPaint::kStroke_Style);
         canvas->drawRect(rect, strokePaint);
 
         canvas->translate(SkIntToScalar(80), 0);
     }
 
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new ImageFiltersCropExpandGM; )