Revert of Move SkTypeface to sk_sp.

tests/TextBlobTest.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 "SkPaint.h"
 #include "SkPoint.h"
 #include "SkTextBlobRunIterator.h"
@@ skipping 160 matching lines @@
             SkAutoTUnref<const SkTextBlob> blob(builder.build());
             REPORTER_ASSERT(reporter, blob->bounds().isEmpty());
         }
     }
 
     // Verify that text-related properties are captured in run paints.
     static void TestPaintProps(skiatest::Reporter* reporter) {
         SkPaint font;
         font.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
+        SkAutoTUnref<SkTypeface> typeface(SkTypeface::RefDefault());
+
         // Kitchen sink font.
         font.setTextSize(42);
         font.setTextScaleX(4.2f);
-        font.setTypeface(SkTypeface::MakeDefault());
+        font.setTypeface(typeface);
         font.setTextSkewX(0.42f);
         font.setTextAlign(SkPaint::kCenter_Align);
         font.setHinting(SkPaint::kFull_Hinting);
         font.setAntiAlias(true);
         font.setUnderlineText(true);
         font.setStrikeThruText(true);
         font.setFakeBoldText(true);
         font.setLinearText(true);
         font.setSubpixelText(true);
         font.setDevKernText(true);
@@ skipping 147 matching lines @@
 };
 
 DEF_TEST(TextBlob_builder, reporter) {
     TextBlobTester::TestBuilder(reporter);
     TextBlobTester::TestBounds(reporter);
 }
 
 DEF_TEST(TextBlob_paint, reporter) {
     TextBlobTester::TestPaintProps(reporter);
 }