Revert of Move SkTypeface to sk_sp.

tests/FontObjTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFont.h"
 #include "SkPaint.h"
 #include "SkTypeface.h"
 #include "Test.h"
 
 static bool is_use_nonlinear_metrics(const SkPaint& paint) {
     return !paint.isSubpixelText() && !paint.isLinearText();
 }
 
 static bool is_enable_auto_hints(const SkPaint& paint) {
     return paint.isAutohinted();
 }
 
 static bool is_enable_bytecode_hints(const SkPaint& paint) {
     return paint.getHinting() >= SkPaint::kFull_Hinting;
 }
 
 static void test_cachedfont(skiatest::Reporter* reporter, const SkPaint& paint) {
-    sk_sp<SkFont> font(SkFont::Testing_CreateFromPaint(paint));
+    SkAutoTUnref<SkFont> font(SkFont::Testing_CreateFromPaint(paint));
 
     // Currently SkFont resolves null into the default, so only test if paint's is not null
     if (paint.getTypeface()) {
         REPORTER_ASSERT(reporter, font->getTypeface() == paint.getTypeface());
     }
     REPORTER_ASSERT(reporter, font->getSize() == paint.getTextSize());
     REPORTER_ASSERT(reporter, font->getScaleX() == paint.getTextScaleX());
     REPORTER_ASSERT(reporter, font->getSkewX() == paint.getTextSkewX());
 
     REPORTER_ASSERT(reporter, font->isVertical() == paint.isVerticalText());
@@ skipping 34 matching lines @@
         { SK_Scalar1/2, 0 },
         // these two exercise obliquing (skew)
         { SK_Scalar1, -SK_Scalar1/4 },
         { SK_Scalar1/2, -SK_Scalar1/4 },
     };
 
     SkPaint paint;
     char txt[] = "long.text.with.lots.of.dots.";
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(faces); i++) {
-        paint.setTypeface(SkTypeface::MakeFromName(faces[i], SkTypeface::kNormal));
+        SkAutoTUnref<SkTypeface> face(SkTypeface::CreateFromName(faces[i], SkTypeface::kNormal));
+        paint.setTypeface(face);
 
         for (size_t j = 0; j  < SK_ARRAY_COUNT(settings); j++) {
             paint.setHinting(settings[j].hinting);
             paint.setLinearText((settings[j].flags & SkPaint::kLinearText_Flag) != 0);
             paint.setSubpixelText((settings[j].flags & SkPaint::kSubpixelText_Flag) != 0);
 
             for (size_t k = 0; k < SK_ARRAY_COUNT(gScaleRec); ++k) {
                 paint.setTextScaleX(gScaleRec[k].fScaleX);
                 paint.setTextSkewX(gScaleRec[k].fSkewX);
 
                 test_cachedfont(reporter, paint);
 
                 SkRect bounds;
 
                 // For no hinting and light hinting this should take the
                 // optimized generateAdvance path.
                 SkScalar width1 = paint.measureText(txt, strlen(txt));
 
                 // Requesting the bounds forces a generateMetrics call.
                 SkScalar width2 = paint.measureText(txt, strlen(txt), &bounds);
 
                 REPORTER_ASSERT(reporter, width1 == width2);
 
-                sk_sp<SkFont> font(SkFont::Testing_CreateFromPaint(paint));
+                SkAutoTUnref<SkFont> font(SkFont::Testing_CreateFromPaint(paint));
                 SkScalar font_width1 = font->measureText(txt, strlen(txt), kUTF8_SkTextEncoding);
                 // measureText not yet implemented...
                 REPORTER_ASSERT(reporter, font_width1 == -1);
 //                REPORTER_ASSERT(reporter, width1 == font_width1);
             }
         }
     }
 }
 
 DEF_TEST(FontObj, reporter) {
     test_cachedfont(reporter);
 }
 
 // need tests for SkStrSearch