Revert of SkPDF: Add sk_sp setters; .release() becomes std::move()

src/pdf/SkPDFResourceDict.cpp

Index: src/pdf/SkPDFResourceDict.cpp
diff --git a/src/pdf/SkPDFResourceDict.cpp b/src/pdf/SkPDFResourceDict.cpp
index 6c7f019c155f23e870837df85d4a81e6b886af81..d3f4a6d53347d29c36518e0c18cfd105f86cad23 100644
--- a/src/pdf/SkPDFResourceDict.cpp
+++ b/src/pdf/SkPDFResourceDict.cpp
@@ -64,12 +64,12 @@
     auto resources = sk_make_sp<SkPDFDict>();
     for (int i = 0; i < resourceList.count(); i++) {
         resources->insertObjRef(SkPDFResourceDict::getResourceName(type, i),
-                                sk_sp<SkPDFObject>(SkRef(resourceList[i])));
+                                SkRef(resourceList[i]));
     }
-    dst->insertObject(get_resource_type_name(type), std::move(resources));
+    dst->insertObject(get_resource_type_name(type), resources.release());
 }
 
-sk_sp<SkPDFDict> SkPDFResourceDict::Make(
+SkPDFDict* SkPDFResourceDict::Create(
         const SkTDArray<SkPDFObject*>* gStateResources,
         const SkTDArray<SkPDFObject*>* patternResources,
         const SkTDArray<SkPDFObject*>* xObjectResources,
@@ -83,7 +83,7 @@
     for (size_t i = 0; i < SK_ARRAY_COUNT(kProcs); i++) {
         procSets->appendName(kProcs[i]);
     }
-    dict->insertObject("ProcSets", std::move(procSets));
+    dict->insertObject("ProcSets", procSets.release());
 
     if (gStateResources) {
         add_subdict(*gStateResources, kExtGState_ResourceType, dict.get());
@@ -97,5 +97,5 @@
     if (fontResources) {
         add_subdict(*fontResources, kFont_ResourceType, dict.get());
     }
-    return std::move(dict);
+    return dict.release();
 }