Revert of Move SkTypeface to sk_sp.

gm/mixedtextblobs.cpp

 /*
  * Copyright 2013 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"
@@ skipping 21 matching lines @@
     canvas->drawTextBlob(blob, 0, 0, paint);
     canvas->restore();
 }
 
 class MixedTextBlobsGM : public GM {
 public:
     MixedTextBlobsGM() { }
 
 protected:
     void onOnceBeforeDraw() override {
-        fEmojiTypeface = sk_tool_utils::emoji_typeface();
+        sk_tool_utils::emoji_typeface(&fEmojiTypeface);
         fEmojiText = sk_tool_utils::emoji_sample_text();
-        fReallyBigATypeface = MakeResourceAsTypeface("/fonts/ReallyBigA.ttf");
+        fReallyBigATypeface.reset(GetResourceAsTypeface("/fonts/ReallyBigA.ttf"));
 
         SkTextBlobBuilder builder;
 
         // make textblob
         // Text so large we draw as paths
         SkPaint paint;
         paint.setTextSize(385);
         const char* text = "O";
         sk_tool_utils::set_portable_typeface(&paint);
 
@@ skipping 88 matching lines @@
                 canvas->translate(SkScalarFloorToScalar(bounds.width() + SkIntToScalar(25)),
                                   -(x * SkScalarFloorToScalar(bounds.height() +
                                     SkIntToScalar(25))));
             } else {
                 canvas->translate(0, SkScalarFloorToScalar(bounds.height() + SkIntToScalar(25)));
             }
         }
     }
 
 private:
-    sk_sp<SkTypeface> fEmojiTypeface;
-    sk_sp<SkTypeface> fReallyBigATypeface;
+    SkAutoTUnref<SkTypeface> fEmojiTypeface;
+    SkAutoTUnref<SkTypeface> fReallyBigATypeface;
     const char* fEmojiText;
     SkAutoTUnref<const SkTextBlob> fBlob;
 
     static const int kWidth = 1250;
     static const int kHeight = 700;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new MixedTextBlobsGM;)
 }