| Index: include/ports/SkFontMgr_indirect.h
 | 
| diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h
 | 
| index 406a75a7ee357f90743563c955251ea0c5ee17e7..6c258c851de3a66201e83bd098097260e136a921 100644
 | 
| --- a/include/ports/SkFontMgr_indirect.h
 | 
| +++ b/include/ports/SkFontMgr_indirect.h
 | 
| @@ -28,8 +28,8 @@ 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:
 | 
| @@ -60,8 +60,8 @@ protected:
 | 
|  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
 | 
| 
 |