Revert of Move SkTypeface to sk_sp.

tools/using_skia_and_harfbuzz.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This sample progam demonstrates how to use Skia and HarfBuzz to
 // produce a PDF file from UTF-8 text in stdin.
 
@@ skipping 124 matching lines @@
 struct Face {
   struct HBFDel { void operator()(hb_face_t* f) { hb_face_destroy(f); } };
   std::unique_ptr<hb_face_t, HBFDel> fHarfBuzzFace;
   sk_sp<SkTypeface> fSkiaTypeface;
 
   Face(const char* path, int index) {
     // fairly portable mmap impl
     auto data = SkData::MakeFromFileName(path);
     assert(data);
     if (!data) { return; }
-    fSkiaTypeface = SkTypeface::MakeFromStream(new SkMemoryStream(data), index);
+    fSkiaTypeface.reset(
+      SkTypeface::CreateFromStream(
+        new SkMemoryStream(data), index));
     assert(fSkiaTypeface);
     if (!fSkiaTypeface) { return; }
     auto destroy = [](void *d) { static_cast<SkData*>(d)->unref(); };
     const char* bytes = (const char*)data->data();
     unsigned int size = (unsigned int)data->size();
     hb_blob_t* blob = hb_blob_create(bytes,
                                      size,
                                      HB_MEMORY_MODE_READONLY,
                                      data.release(),
                                      destroy);
@@ skipping 139 matching lines @@
     Config config(argc, argv);
 
     Placement placement(config, new SkFILEWStream(config.output_file_name->value.c_str()));
     for (std::string line; std::getline(std::cin, line);) {
       placement.WriteLine(line.c_str());
     }
     placement.Close();
 
     return 0;
 }