Revert of SkFontData to use smart pointers. (patchset #3 id:40001 of https://codereview.chromium.org/2339273002/ )

Reason for revert:
Killing Mac

Original issue's description:
> SkFontData to use smart pointers.
>
> The SkFontData type is not exposed externally, so any method which uses
> it can be updated to use smart pointers without affecting external
> users. Updating this first will make updating the public API much
> easier.
>
> This also updates SkStreamAsset* SkStream::NewFromFile(const char*) to
> std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char*). It
> appears that no one outside Skia is currently using SkStream::NewfromFile
> so this is a good time to update it as well.
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339273002
>
> Committed: https://skia.googlesource.com/skia/+/d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c

TBR=mtklein@chromium.org,halcanary@google.com,mtklein@google.com,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2343933002

1 files changed, 5 insertions, 6 deletions

diff --git a/src/core/SkFontDescriptor.cpp b/src/core/SkFontDescriptor.cpp
index 73ea2058ce..85629efa7e 100644
--- a/src/core/SkFontDescriptor.cpp
+++ b/src/core/SkFontDescriptor.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SkFontDescriptor.h"
-#include "SkMakeUnique.h"
 #include "SkStream.h"
 #include "SkData.h"
 
@@ -107,8 +106,8 @@ bool SkFontDescriptor::Deserialize(SkStream* stream, SkFontDescriptor* result) {
     if (length > 0) {
         sk_sp<SkData> data(SkData::MakeUninitialized(length));
         if (stream->read(data->writable_data(), length) == length) {
-            result->fFontData = skstd::make_unique<SkFontData>(
-                skstd::make_unique<SkMemoryStream>(data), index, axis, axisCount);
+            result->fFontData.reset(new SkFontData(new SkMemoryStream(data),
+                                                   index, axis, axisCount));
         } else {
             SkDEBUGFAIL("Could not read font data");
             return false;
@@ -139,10 +138,10 @@ void SkFontDescriptor::serialize(SkWStream* stream) {
     stream->writePackedUInt(kSentinel);
 
     if (fFontData.get() && fFontData->hasStream()) {
-        std::unique_ptr<SkStreamAsset> fontStream = fFontData->detachStream();
-        size_t length = fontStream->getLength();
+        SkAutoTDelete<SkStreamAsset> fontData(fFontData->detachStream());
+        size_t length = fontData->getLength();
         stream->writePackedUInt(length);
-        stream->writeStream(fontStream.get(), length);
+        stream->writeStream(fontData, length);
     } else {
         stream->writePackedUInt(0);
     }