Revert of SkFontData to use smart pointers.

include/core/SkStream.h

Index: include/core/SkStream.h
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index 7afce712401c98e78f560ad8f4853f7395123092..48ac577070b289a7ef31016b68c302fd32a5f6e8 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -40,9 +40,11 @@
     virtual ~SkStream() {}
 
     /**
-     *  Attempts to open the specified file as a stream, returns nullptr on failure.
-     */
-    static std::unique_ptr<SkStreamAsset> MakeFromFile(const char path[]);
+     *  Attempts to open the specified file, and return a stream to it (using
+     *  mmap if available). On success, the caller is responsible for deleting.
+     *  On failure, returns NULL.
+     */
+    static SkStreamAsset* NewFromFile(const char path[]);
 
     /** Reads or skips size number of bytes.
      *  If buffer == NULL, skip size bytes, return how many were skipped.