partial switch over to sp usage of shaders

gm/colortype.cpp

Index: gm/colortype.cpp
diff --git a/gm/colortype.cpp b/gm/colortype.cpp
index 76b13817a945452e369a50075e6a95e7ca2ef8f4..c9314de2a456479eecd88b92fcd3cec6c41ac9e1 100644
--- a/gm/colortype.cpp
+++ b/gm/colortype.cpp
@@ -28,15 +28,12 @@ protected:
         };
         SkMatrix local;
         local.setRotate(180);
-        SkShader* s = SkGradientShader::CreateSweep(0,0, colors, nullptr,
-                                                    SK_ARRAY_COUNT(colors), 0, &local);
-
         SkPaint paint;
         paint.setAntiAlias(true);
-        paint.setShader(s)->unref();
+        paint.setShader(SkGradientShader::MakeSweep(0, 0, colors, nullptr, SK_ARRAY_COUNT(colors),
+                                                    0, &local));
 
-        SkTypeface* orig = sk_tool_utils::create_portable_typeface("serif",
-                                                            SkTypeface::kBold);
+        SkTypeface* orig = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold);
         if (nullptr == orig) {
             orig = SkTypeface::RefDefault();
         }