Remove SkAutoTUnref and SkAutoTDelete from public includes.

include/ports/SkFontMgr_indirect.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontMgr_indirect_DEFINED
 #define SkFontMgr_indirect_DEFINED
 
@@ skipping 10 matching lines @@
 class SkData;
 class SkFontStyle;
 class SkStreamAsset;
 class SkString;
 
 class SK_API SkFontMgr_Indirect : public SkFontMgr {
 public:
     // TODO: The SkFontMgr is only used for createFromStream/File/Data.
     // In the future these calls should be broken out into their own interface
     // with a name like SkFontRenderer.
-    SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy)
-        : fImpl(SkRef(impl)), fProxy(SkRef(proxy))
+    SkFontMgr_Indirect(sk_sp<SkFontMgr> impl, sk_sp<SkRemotableFontMgr> proxy)
+        : fImpl(std::move(impl)), fProxy(std::move(proxy))
     { }
 
 protected:
     int onCountFamilies() const override;
     void onGetFamilyName(int index, SkString* familyName) const override;
     SkFontStyleSet* onCreateStyleSet(int index) const override;
 
     SkFontStyleSet* onMatchFamily(const char familyName[]) const override;
 
     SkTypeface* onMatchFamilyStyle(const char familyName[],
@@ skipping 10 matching lines @@
 
     SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override;
     SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override;
     SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override;
 
     SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const override;
 
 private:
     SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const;
 
-    SkAutoTUnref<SkFontMgr> fImpl;
-    SkAutoTUnref<SkRemotableFontMgr> fProxy;
+    sk_sp<SkFontMgr> fImpl;
+    sk_sp<SkRemotableFontMgr> fProxy;
 
     struct DataEntry {
         uint32_t fDataId;  // key1
         uint32_t fTtcIndex;  // key2
         SkTypeface* fTypeface;  // value: weak ref to typeface
 
         DataEntry() { }
 
         DataEntry(DataEntry&& that)
             : fDataId(that.fDataId)
@@ skipping 21 matching lines @@
     mutable SkMutex fDataCacheMutex;
 
     mutable sk_sp<SkDataTable> fFamilyNames;
     mutable SkOnce fFamilyNamesInitOnce;
     static void set_up_family_names(const SkFontMgr_Indirect* self);
 
     friend class SkStyleSet_Indirect;
 };
 
 #endif