Revert of SkFontData to use smart pointers.

src/utils/mac/SkStream_mac.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
 
@@ skipping 30 matching lines @@
     SkASSERT(info);
     ((SkStream*)info)->rewind();
 }
 
 // Used when info is an SkStream.
 static void release_info_proc(void* info) {
     SkASSERT(info);
     delete (SkStream*)info;
 }
 
-CGDataProviderRef SkCreateDataProviderFromStream(std::unique_ptr<SkStream> stream) {
+CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
     // TODO: Replace with SkStream::getData() when that is added. Then we only
     // have one version of CGDataProviderCreateWithData (i.e. same release proc)
     const void* addr = stream->getMemoryBase();
     if (addr) {
         // special-case when the stream is just a block of ram
-        return CGDataProviderCreateWithData(stream.release(), addr, stream->getLength(),
+        return CGDataProviderCreateWithData(stream, addr, stream->getLength(),
                                             delete_stream_proc);
     }
 
     CGDataProviderSequentialCallbacks rec;
     sk_bzero(&rec, sizeof(rec));
     rec.version = 0;
     rec.getBytes = get_bytes_proc;
     rec.skipForward = skip_forward_proc;
     rec.rewind = rewind_proc;
     rec.releaseInfo = release_info_proc;
-    return CGDataProviderCreateSequential(stream.release(), &rec);
+    return CGDataProviderCreateSequential(stream, &rec);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkData.h"
 
-CGDataProviderRef SkCreateDataProviderFromData(sk_sp<SkData> data) {
-    return CGDataProviderCreateWithData(data.release(), data->data(), data->size(), unref_proc);
+CGDataProviderRef SkCreateDataProviderFromData(SkData* data) {
+    data->ref();
+    return CGDataProviderCreateWithData(data, data->data(), data->size(),
+                                            unref_proc);
 }
 
 #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)