Revert of more shader-->sp conversions

tests/DrawBitmapRectTest.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 "SkData.h"
@@ skipping 177 matching lines @@
     }
     bm.eraseColor(SK_ColorRED);
 
     matrix.setAll(0.0078740157f,
                   0,
                   SkIntToScalar(249),
                   0,
                   0.0078740157f,
                   SkIntToScalar(239),
                   0, 0, SK_Scalar1);
+    SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
+                                               SkShader::kRepeat_TileMode, &matrix);
+
     SkPaint paint;
-    paint.setShader(SkShader::MakeBitmapShader(bm, SkShader::kRepeat_TileMode,
-                                               SkShader::kRepeat_TileMode, &matrix));
+    paint.setShader(s)->unref();
 
     SkRect r = SkRect::MakeXYWH(681, 239, 695, 253);
     c.drawRect(r, paint);
 
     assert_ifDrawnTo(reporter, dev, shouldBeDrawn);
 }
 
 /*
  *  Original bug was asserting that the matrix-proc had generated a (Y) value
  *  that was out of range. This led (in the release build) to the sampler-proc
@@ skipping 92 matching lines @@
 
     // ensure that we draw nothing if srcR does not intersect the bitmap
     REPORTER_ASSERT(reporter, check_for_all_zeros(dst));
 
     test_nan_antihair();
     test_giantrepeat_crbug118018(reporter);
 
     test_treatAsSprite(reporter);
     test_faulty_pixelref(reporter);
 }