Revert of Port uses of SkLazyPtr to SkOncePtr.

include/core/SkTypeface.h

Index: include/core/SkTypeface.h
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index 0b1ca6a4bdaf02c231fa61fe2e62a68f24b94672..c4242181fb27cff117fef660776b4edf45a81e8b 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -10,11 +10,11 @@
 #ifndef SkTypeface_DEFINED
 #define SkTypeface_DEFINED
 
-#include "../private/SkOncePtr.h"
-#include "../private/SkWeakRefCnt.h"
 #include "SkFontStyle.h"
+#include "SkLazyPtr.h"
 #include "SkRect.h"
 #include "SkString.h"
+#include "../private/SkWeakRefCnt.h"
 
 class SkDescriptor;
 class SkFontData;
@@ -398,7 +398,10 @@
     static SkTypeface* CreateDefault(int style);  // SkLazyPtr requires an int, not a Style.
     static void        DeleteDefault(SkTypeface*);
 
-    SkOncePtr<SkRect>   fLazyBounds;
+    struct BoundsComputer;
+//    friend struct BoundsComputer;
+
+    SkLazyPtr<SkRect>   fLazyBounds;
     SkFontID            fUniqueID;
     SkFontStyle         fStyle;
     bool                fIsFixedPitch;