return pictures as sk_sp

tests/RecordingXfermodeTest.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 "../include/core/SkCanvas.h"
@@ skipping 96 matching lines @@
     virtual const SkBitmap& recordAndReplay(const Drawer& drawer,
                                             const SkRect& intoClip,
                                             SkXfermode::Mode mode) {
         SkRTreeFactory factory;
         SkPictureRecorder recorder;
         SkRect canvasRect(SkRect::MakeWH(SkIntToScalar(fWidth),SkIntToScalar(fHeight)));
         SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(fWidth),
                                                    SkIntToScalar(fHeight),
                                                    &factory);
         drawer.draw(canvas, canvasRect, mode);
-        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+        sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
 
         SkCanvas replayCanvas(fBitmap);
         replayCanvas.clear(0xffffffff);
         replayCanvas.clipRect(intoClip);
         picture->playback(&replayCanvas);
         return fBitmap;
     }
 
  private:
     SkBitmap fBitmap;
@@ skipping 36 matching lines @@
             errors.appendf("For SkXfermode %d %s:    SkPictureRecorder bitmap is wrong\n",
                            iMode, SkXfermode::ModeName(mode));
         }
 #endif
     }
 
 #if !FINEGRAIN
     REPORTER_ASSERT_MESSAGE(reporter, 0 == numErrors, errors.c_str());
 #endif
 }