Revert of SkFontData to use smart pointers.

src/animator/SkAnimateMaker.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 "SkAnimateMaker.h"
@@ skipping 81 matching lines @@
 {
     SkDisplayXMLParser parser(*this);
     return parser.parse(*stream);
 }
 
 // differs from SkAnimator::decodeURI in that it does not set URI base
 bool SkAnimateMaker::decodeURI(const char uri[]) {
 //  SkDebugf("animator decode %s\n", uri);
 
 //    SkStream* stream = SkStream::GetURIStream(fPrefix.c_str(), uri);
-    std::unique_ptr<SkStream> stream = SkStream::MakeFromFile(uri);
-    if (stream) {
-        bool success = decodeStream(stream.get());
+    SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(uri));
+    if (stream.get()) {
+        bool success = decodeStream(stream);
         if (hasError() && fError.hasNoun() == false)
             fError.setNoun(uri);
         return success;
     } else {
         return false;
     }
 }
 
 #if defined SK_DEBUG && 0
 //used for the if'd out section of deleteMembers
@@ skipping 248 matching lines @@
 }
 
 bool SkAnimateMaker::GetStep(const char* token, size_t len, void* stepPtr, SkScriptValue* value) {
     if (SK_LITERAL_STR_EQUAL("step", token, len)) {
         value->fOperand.fS32 = *(int32_t*) stepPtr;
         value->fType = SkType_Int;
         return true;
     }
     return false;
 }