Update the name of the friended android class and add the appropriate guards.

include/core/SkPictureRecorder.h

Index: include/core/SkPictureRecorder.h
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h
index b13b8a809b21695e3c9ce86e73712120c572465b..a58e8275628e02a403fa2577eef8be8b58ec075f 100644
--- a/include/core/SkPictureRecorder.h
+++ b/include/core/SkPictureRecorder.h
@@ -12,6 +12,12 @@
 #include "SkPicture.h"
 #include "SkRefCnt.h"
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+namespace android {
+    class Picture;
+};
+#endif
+
 class SkCanvas;
 class SkPictureRecord;
 class SkRecord;
@@ -65,7 +71,10 @@ private:
     /** Replay the current (partially recorded) operation stream into
         canvas. This call doesn't close the current recording.
     */
-    friend class AndroidPicture;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK

[robertphillips, 2014/06/23 15:21:15]

Can we get rid of AndroidPicture now?

+    friend class AndroidPicture; // This is temporary until we remove this from the framework
+    friend class android::Picture;
+#endif
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;