Revert of Move SkTypeface to sk_sp.

gm/typeface.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkString.h"
@@ skipping 72 matching lines @@
     { "serif", SkTypeface::kBoldItalic },
     { "monospace", SkTypeface::kNormal },
     { "monospace", SkTypeface::kBold },
     { "monospace", SkTypeface::kItalic },
     { "monospace", SkTypeface::kBoldItalic },
 };
 
 static const int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles);
 
 class TypefaceStylesGM : public skiagm::GM {
-    sk_sp<SkTypeface> fFaces[gFaceStylesCount];
+    SkTypeface* fFaces[gFaceStylesCount];
     bool fApplyKerning;
 
 public:
     TypefaceStylesGM(bool applyKerning)
         : fApplyKerning(applyKerning) {
         memset(fFaces, 0, sizeof(fFaces));
     }
 
+    virtual ~TypefaceStylesGM() {
+        for (int i = 0; i < gFaceStylesCount; i++) {
+            SkSafeUnref(fFaces[i]);
+        }
+    }
+
 protected:
     void onOnceBeforeDraw() override {
         for (int i = 0; i < gFaceStylesCount; i++) {
-            fFaces[i] = SkTypeface::MakeFromName(
+            fFaces[i] = SkTypeface::CreateFromName(
                     sk_tool_utils::platform_font_name(gFaceStyles[i].fName), gFaceStyles[i].fStyle);
         }
     }
 
     SkString onShortName() override {
         SkString name("typefacestyles");
         if (fApplyKerning) {
             name.append("_kerning");
         }
         name.append(sk_tool_utils::major_platform_os_name());
@@ skipping 32 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TypefaceStylesGM(false); )
 DEF_GM( return new TypefaceStylesGM(true); )