Revert of Move SkTypeface to sk_sp.

bench/TextBlobBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "Resources.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 #include "SkTextBlob.h"
 #include "SkTypeface.h"
 
 #include "sk_tool_utils.h"
 
 /*
  * A trivial test which benchmarks the performance of a textblob with a single run.
  */
 class TextBlobBench : public Benchmark {
 public:
-    TextBlobBench() {}
+    TextBlobBench()
+        : fTypeface(nullptr) {
+    }
 
 protected:
     void onDelayedSetup() override {
-        fTypeface = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal);
+        fTypeface.reset(sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal));
         // make textblob
         SkPaint paint;
         paint.setTypeface(fTypeface);
         const char* text = "Hello blob!";
         SkTDArray<uint16_t> glyphs;
         size_t len = strlen(text);
         glyphs.append(paint.textToGlyphs(text, len, nullptr));
         paint.textToGlyphs(text, len, glyphs.begin());
 
         SkTextBlobBuilder builder;
@@ skipping 14 matching lines @@
         SkPaint paint;
 
         // To ensure maximum caching, we just redraw the blob at the same place everytime
         for (int i = 0; i < loops; i++) {
             canvas->drawTextBlob(fBlob, 0, 0, paint);
         }
     }
 
 private:
 
-    SkAutoTUnref<const SkTextBlob>  fBlob;
-    SkTDArray<uint16_t>             fGlyphs;
-    sk_sp<SkTypeface>               fTypeface;
+    SkAutoTUnref<const SkTextBlob> fBlob;
+    SkTDArray<uint16_t>      fGlyphs;
+    SkAutoTUnref<SkTypeface> fTypeface;
 
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH( return new TextBlobBench(); )