Revert of SkFontData to use smart pointers.

src/core/SkFontDescriptor.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 "SkFontDescriptor.h"
-#include "SkMakeUnique.h"
 #include "SkStream.h"
 #include "SkData.h"
 
 enum {
     // these must match the sfnt 'name' enums
     kFontFamilyName = 0x01,
     kFullName       = 0x04,
     kPostscriptName = 0x06,
 
     // These count backwards from 0xFF, so as not to collide with the SFNT
@@ skipping 80 matching lines @@
             default:
                 SkDEBUGFAIL("Unknown id used by a font descriptor");
                 return false;
         }
     }
 
     size_t length = stream->readPackedUInt();
     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;
         }
     }
     return true;
 }
 
 void SkFontDescriptor::serialize(SkWStream* stream) {
     uint32_t styleBits = (fStyle.weight() << 16) | (fStyle.width() << 8) | (fStyle.slant());
@@ skipping 10 matching lines @@
             write_uint(stream, fFontData->getAxisCount(), kFontAxes);
             for (int i = 0; i < fFontData->getAxisCount(); ++i) {
                 stream->writePackedUInt(fFontData->getAxis()[i]);
             }
         }
     }
 
     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);
     }
 }