Revert of Move SkTypeface to sk_sp.

gm/poly2poly.cpp

 /*
  * Copyright 2011 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 "Resources.h"
 #include "SkPath.h"
@@ skipping 206 matching lines @@
         paint->setColor(SK_ColorRED);
         paint->setStyle(SkPaint::kFill_Style);
         SkScalar x = D/2;
         SkScalar y = D/2 - (fm.fAscent + fm.fDescent)/2;
         uint16_t glyphID = 3; // X
         canvas->drawText((void*) &glyphID, sizeof(glyphID), x, y, *paint);
         canvas->restore();
     }
 
     void onOnceBeforeDraw() override {
-        fEmFace = MakeResourceAsTypeface("/fonts/Em.ttf");
+        fEmFace.reset(GetResourceAsTypeface("/fonts/Em.ttf"));
     }
 
     void onDraw(SkCanvas* canvas) override {
         if (false) { test_stroke(canvas); return; }
 
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setTypeface(fEmFace);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
         paint.setStrokeWidth(SkIntToScalar(4));
@@ skipping 28 matching lines @@
         canvas->translate(SkIntToScalar(160), SkIntToScalar(110));
         // perspective (4 points)
         const int src4[] = { 0, 0, 64, 0, 64, 64, 0, 64 };
         const int dst4[] = { 0, 0, 96, 0, 64, 96, 0, 64 };
         doDraw(canvas, &paint, src4, dst4, 4);
         canvas->restore();
     }
 
 private:
     typedef skiagm::GM INHERITED;
-    sk_sp<SkTypeface> fEmFace;
+    SkAutoTUnref<SkTypeface> fEmFace;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new Poly2PolyGM; )