SkFontData to use smart pointers.

src/core/SkStream.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkData.h"
 #include "SkFixed.h"
+#include "SkMakeUnique.h"
 #include "SkString.h"
 #include "SkOSFile.h"
 #include "SkTypes.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 
 int8_t SkStream::readS8() {
     int8_t value;
     SkDEBUGCODE(size_t len =) this->read(&value, 1);
@@ skipping 824 matching lines @@
     FILE* file = sk_fopen(path, kRead_SkFILE_Flag);
     if (nullptr == file) {
         return nullptr;
     }
 
     auto data = SkData::MakeFromFILE(file);
     sk_fclose(file);
     return data;
 }
 
-SkStreamAsset* SkStream::NewFromFile(const char path[]) {
+std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char path[]) {
     auto data(mmap_filename(path));
     if (data) {
-        return new SkMemoryStream(std::move(data));
+        return skstd::make_unique<SkMemoryStream>(std::move(data));
     }
 
-    // If we get here, then our attempt at using mmap failed, so try normal
-    // file access.
-    SkFILEStream* stream = new SkFILEStream(path);
+    // If we get here, then our attempt at using mmap failed, so try normal file access.
+    auto stream = skstd::make_unique<SkFILEStream>(path);
     if (!stream->isValid()) {
-        delete stream;
-        stream = nullptr;
+        return nullptr;
     }
-    return stream;
+    return std::move(stream);
 }
 
 // Declared in SkStreamPriv.h:
 sk_sp<SkData> SkCopyStreamToData(SkStream* stream) {
     SkASSERT(stream != nullptr);
 
     if (stream->hasLength()) {
         return SkData::MakeFromStream(stream, stream->getLength());
     }
 
@@ skipping 21 matching lines @@
     while (true) {
         count = input->read(scratch, sizeof(scratch));
         if (0 == count) {
             return true;
         }
         if (!out->write(scratch, count)) {
             return false;
         }
     }
 }