Revert of Add SkNVRefCnt, prune down SkPicture's size

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 3eb1247800fb4aad9f0ed80af565471ec410fa67..62d4e74462d0c54499b8828cd3e50e343cfa5fe5 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1581,7 +1581,7 @@
                                                                            compareConfig.fName);
 
     SkPicture* pict = gmmain.generate_new_picture(gm, kNone_BbhType, 0);
-    SkAutoTUnref<SkPicture> aur(pict);
+    SkAutoUnref aur(pict);
     if (FLAGS_replay) {
         const char renderModeDescriptor[] = "-replay";
         if (gmFlags & GM::kSkipPicture_Flag) {
@@ -1605,7 +1605,7 @@
             errorsForAllModes.add(kIntentionallySkipped_ErrorType);
         } else {
             SkPicture* repict = gmmain.stream_to_new_picture(*pict);
-            SkAutoTUnref<SkPicture> aurr(repict);
+            SkAutoUnref aurr(repict);
             SkBitmap bitmap;
             gmmain.generate_image_from_picture(gm, compareConfig, repict, &bitmap);
             errorsForAllModes.add(gmmain.compare_test_results_to_reference_bitmap(
@@ -1638,7 +1638,7 @@
             errorsForAllModes.add(kIntentionallySkipped_ErrorType);
         } else {
             SkPicture* pict = gmmain.generate_new_picture(gm, kRTree_BbhType, 0);
-            SkAutoTUnref<SkPicture> aur(pict);
+            SkAutoUnref aur(pict);
             SkBitmap bitmap;
             gmmain.generate_image_from_picture(gm, compareConfig, pict, &bitmap);
             errorsForAllModes.add(gmmain.compare_test_results_to_reference_bitmap(
@@ -1668,7 +1668,7 @@
                 SkScalar recordScale = SkScalarInvert(replayScale);
                 SkPicture* pict = gmmain.generate_new_picture(
                     gm, kTileGrid_BbhType, 0, recordScale);
-                SkAutoTUnref<SkPicture> aur(pict);
+                SkAutoUnref aur(pict);
                 SkBitmap bitmap;
                 // We cannot yet pass 'true' to generate_image_from_picture to
                 // perform actual tiled rendering (see Issue 1198 -