Revert of more shader-->sp conversions

tests/RecorderTest.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 "Test.h"
 
 #include "SkPictureRecorder.h"
@@ skipping 40 matching lines @@
 }
 
 // Regression test for leaking refs held by optional arguments.
 DEF_TEST(Recorder_RefLeaking, r) {
     // We use SaveLayer to test:
     //   - its SkRect argument is optional and SkRect is POD.  Just testing that that works.
     //   - its SkPaint argument is optional and SkPaint is not POD.  The bug was here.
 
     SkRect bounds = SkRect::MakeWH(320, 240);
     SkPaint paint;
-    paint.setShader(SkShader::MakeEmptyShader());
+    paint.setShader(SkShader::CreateEmptyShader())->unref();
 
     REPORTER_ASSERT(r, paint.getShader()->unique());
     {
         SkRecord record;
         SkRecorder recorder(&record, 1920, 1080);
         recorder.saveLayer(&bounds, &paint);
         REPORTER_ASSERT(r, !paint.getShader()->unique());
     }
     REPORTER_ASSERT(r, paint.getShader()->unique());
 }
@@ skipping 29 matching lines @@
         recorder.drawImageRect(image.get(), SkRect::MakeWH(100, 100), nullptr);
         REPORTER_ASSERT(reporter, !image->unique());
 
         Tally tally;
         tally.apply(record);
 
         REPORTER_ASSERT(reporter, 1 == tally.count<SkRecords::DrawImageRect>());
     }
     REPORTER_ASSERT(reporter, image->unique());
 }