Revert of more shader-->sp conversions

gm/surface.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 "SkGradientShader.h"
 #include "SkSurface.h"
 #include "SkSurfaceProps.h"
 
 #define W 200
 #define H 100
 
-static sk_sp<SkShader> make_shader() {
+static SkShader* make_shader() {
     int a = 0x99;
     int b = 0xBB;
     SkPoint pts[] = { { 0, 0 }, { W, H } };
     SkColor colors[] = { SkColorSetRGB(a, a, a), SkColorSetRGB(b, b, b) };
-    return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
+    return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
 }
 
 static SkSurface* make_surface(GrContext* ctx, const SkImageInfo& info, SkPixelGeometry geo,
                                int disallowAA, int disallowDither) {
     uint32_t flags = 0;
     if (disallowAA) {
         flags |= SkSurfaceProps::kDisallowAntiAlias_Flag;
     }
     if (disallowDither) {
         flags |= SkSurfaceProps::kDisallowDither_Flag;
     }
 
     SkSurfaceProps props(flags, geo);
     if (ctx) {
         return SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props);
     } else {
         return SkSurface::NewRaster(info, &props);
     }
 }
 
 static void test_draw(SkCanvas* canvas, const char label[]) {
     SkPaint paint;
 
     paint.setAntiAlias(true);
     paint.setLCDRenderText(true);
     paint.setDither(true);
 
-    paint.setShader(make_shader());
+    paint.setShader(make_shader())->unref();
     canvas->drawRect(SkRect::MakeWH(W, H), paint);
     paint.setShader(nullptr);
 
     paint.setColor(SK_ColorWHITE);
     paint.setTextSize(32);
     paint.setTextAlign(SkPaint::kCenter_Align);
     sk_tool_utils::set_portable_typeface(&paint);
     canvas->drawText(label, strlen(label), W / 2, H * 3 / 4, paint);
 }
 
@@ skipping 91 matching lines @@
 
         SkAutoTUnref<SkImage> image2(surf2->newImageSnapshot());
         canvas->drawImage(image2, 10 + SkIntToScalar(image->width()) + 10, 10, nullptr);
     }
 
 private:
     typedef GM INHERITED;
 };
 DEF_GM( return new NewSurfaceGM )