Sketch splitting SkPicture into an interface and SkBigPicture.

tests/PictureTest.cpp

Index: tests/PictureTest.cpp
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 4fe08379dd0545e8648f660fb514d28d8098f525..df22682a06e386861d61bc315bb33e52d7349ce1 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -363,9 +363,10 @@ static void test_savelayer_extraction(skiatest::Reporter* reporter) {
 
     // Now test out the SaveLayer extraction
     if (!SkCanvas::Internal_Private_GetIgnoreSaveLayerBounds()) {
-        SkPicture::AccelData::Key key = SkLayerInfo::ComputeKey();
+        const SkBigPicture* bp = pict->asSkBigPicture();
+        REPORTER_ASSERT(reporter, bp);
 
-        const SkPicture::AccelData* data = pict->EXPERIMENTAL_getAccelData(key);
+        const SkBigPicture::AccelData* data = bp->accelData();
         REPORTER_ASSERT(reporter, data);
 
         const SkLayerInfo *gpuData = static_cast<const SkLayerInfo*>(data);