Revert of more shader-->sp conversions

tests/BlitRowTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 148 matching lines @@
 struct Mesh {
     SkPoint     fPts[4];
 
     Mesh(const SkBitmap& bm, SkPaint* paint) {
         const SkScalar w = SkIntToScalar(bm.width());
         const SkScalar h = SkIntToScalar(bm.height());
         fPts[0].set(0, 0);
         fPts[1].set(w, 0);
         fPts[2].set(w, h);
         fPts[3].set(0, h);
-        paint->setShader(SkShader::MakeBitmapShader(bm, SkShader::kClamp_TileMode,
-                                                    SkShader::kClamp_TileMode));
+        SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMode,
+                                                   SkShader::kClamp_TileMode);
+        paint->setShader(s)->unref();
+
     }
 
     void draw(SkCanvas* canvas, SkPaint* paint) {
         canvas->drawVertices(SkCanvas::kTriangleFan_VertexMode, 4, fPts, fPts,
                              nullptr, nullptr, nullptr, 0, *paint);
     }
 };
 
 #include "SkImageEncoder.h"
 static void save_bm(const SkBitmap& bm, const char name[]) {
@@ skipping 72 matching lines @@
                 }
             }
         }
     }
 }
 
 DEF_TEST(BlitRow, reporter) {
     test_00_FF(reporter);
     test_diagonal(reporter);
 }