Revert of SkFontData to use smart pointers.

tools/dump_record.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DumpRecord.h"
 #include "SkCommandLineFlags.h"
 #include "SkDeferredCanvas.h"
@@ skipping 28 matching lines @@
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
 
     for (int i = 0; i < FLAGS_skps.count(); i++) {
         if (SkCommandLineFlags::ShouldSkip(FLAGS_match, FLAGS_skps[i])) {
             continue;
         }
 
-        std::unique_ptr<SkStream> stream = SkStream::MakeFromFile(FLAGS_skps[i]);
+        SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(FLAGS_skps[i]));
         if (!stream) {
             SkDebugf("Could not read %s.\n", FLAGS_skps[i]);
             return 1;
         }
-        sk_sp<SkPicture> src(SkPicture::MakeFromStream(stream.get()));
+        sk_sp<SkPicture> src(SkPicture::MakeFromStream(stream));
         if (!src) {
             SkDebugf("Could not read %s as an SkPicture.\n", FLAGS_skps[i]);
             return 1;
         }
         if (FLAGS_defer) {
             SkPictureRecorder recorder;
             SkDeferredCanvas deferred(recorder.beginRecording(src->cullRect()));
             src->playback(&deferred);
             src = recorder.finishRecordingAsPicture();
         }
@@ skipping 29 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif