Small refactoring of layer discovery code

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index f0bdd914d5cb17bfc076b23af4a665868c4d24f5..a1ed081466d65de6f3c7ebf4a656991ab2c1bb2a 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -20,6 +20,7 @@
 class GrContext;
 #endif
 
+class GrAccelData;
 class GrReplacements;
 class SkBBoxHierarchy;
 class SkCanvas;
@@ -280,9 +281,9 @@ private:
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class SkGpuDevice;                  // for fData access
     friend class GrLayerHoister;               // access to fRecord
-    friend class SkRecords::CollectLayers;     // access to fRecord
     friend class SkPicturePlayback;            // to get fData
     friend class ReplaceDraw;
+    friend const GrAccelData* GPUOptimize(const SkPicture* pict);
 
     typedef SkRefCnt INHERITED;