return pictures as sk_sp

tests/GpuLayerCacheTest.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.
 */
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
@@ skipping 97 matching lines @@
 // locking & unlocking textures).
 // TODO: need to add checks on VRAM usage!
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GpuLayerCache, reporter, context) {
     // Add one more layer than can fit in the atlas
     static const int kInitialNumLayers = TestingAccess::NumPlots() + 1;
 
 #if GR_CACHE_STATS
     GrResourceCache::Stats stats;
 #endif
 
-    SkAutoTUnref<const SkPicture> picture;
+    sk_sp<SkPicture> picture;
 
     {
         SkPictureRecorder recorder;
         SkCanvas* c = recorder.beginRecording(1, 1);
         // Draw something, anything, to prevent an empty-picture optimization,
         // which is a singleton and never purged.
         c->drawRect(SkRect::MakeWH(1,1), SkPaint());
-        picture.reset(recorder.endRecording());
+        picture = recorder.finishRecordingAsPicture();
     }
 
     GrResourceCache* resourceCache = context->getResourceCache();
 
     GrLayerCache cache(context);
 
     create_layers(reporter, &cache, *picture, kInitialNumLayers, 0);
 
     for (int i = 0; i < kInitialNumLayers; ++i) {
         int key[1] = { i + 1 };
@@ skipping 223 matching lines @@
     cache.end();
 
 #if GR_CACHE_STATS
     resourceCache->getStats(&stats);
     REPORTER_ASSERT(reporter, 2 == stats.fTotal);
     REPORTER_ASSERT(reporter, 2 == stats.fNumPurgeable);
 #endif
 }
 
 #endif