Revert of Port most uses of SkOnce to SkLazyPtr.

src/core/SkLazyPtr.h

Index: src/core/SkLazyPtr.h
diff --git a/src/core/SkLazyPtr.h b/src/core/SkLazyPtr.h
index 28bb895b76ceaa77e5e8b0e0989517a7b5a0a19e..515086876c636bf99fdecacb6db15649ae0429ee 100644
--- a/src/core/SkLazyPtr.h
+++ b/src/core/SkLazyPtr.h
@@ -62,7 +62,7 @@
 #include "SkThread.h"
 #include "SkThreadPriv.h"
 
-// See FIXMEs below.
+// See FIXME below.
 class SkFontConfigInterface;
 class SkTypeface;
 
@@ -100,6 +100,7 @@
 #ifdef SK_DEBUG
     // FIXME: We know we leak refs on some classes.  For now, let them leak.
     void cleanup(SkFontConfigInterface*) {}
+    void cleanup(SkTypeface*) {}
     template <typename U> void cleanup(U* ptr) { Destroy(ptr); }
 
     ~SkLazyPtr() {
@@ -125,12 +126,9 @@
     }
 
 #ifdef SK_DEBUG
-    // FIXME: We know we leak refs on some classes.  For now, let them leak.
-    void cleanup(SkTypeface*) {}
-    template <typename U> void cleanup(U* ptr) { Destroy(ptr); }
     ~SkLazyPtrArray() {
         for (int i = 0; i < N; i++) {
-            this->cleanup((T*)fArray[i]);
+            Destroy((T*)fArray[i]);
             fArray[i] = NULL;
         }
     }