Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.

tools/skdiff_main.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "skdiff.h"
 #include "skdiff_html.h"
 #include "skdiff_utils.h"
 #include "SkBitmap.h"
@@ skipping 325 matching lines @@
         fDrp->fDifference.fBitmap.setPixelRef(nullptr);
         fDrp->fWhite.fBitmap.setPixelRef(nullptr);
     }
 
 private:
     DiffRecord* fDrp;
 };
 
 static void get_bounds(DiffResource& resource, const char* name) {
     if (resource.fBitmap.empty() && !DiffResource::isStatusFailed(resource.fStatus)) {
-        SkAutoDataUnref fileBits(read_file(resource.fFullPath.c_str()));
-        if (nullptr == fileBits) {
+        sk_sp<SkData> fileBits(read_file(resource.fFullPath.c_str()));
+        if (fileBits) {
+            get_bitmap(fileBits.get(), resource, true);
+        } else {
             SkDebugf("WARNING: couldn't read %s file <%s>\n", name, resource.fFullPath.c_str());
             resource.fStatus = DiffResource::kCouldNotRead_Status;
-        } else {
-            get_bitmap(fileBits, resource, true);
         }
     }
 }
 
 static void get_bounds(DiffRecord& drp) {
     get_bounds(drp.fBase, "base");
     get_bounds(drp.fComparison, "comparison");
 }
 
 #ifdef SK_OS_WIN
@@ skipping 103 matching lines @@
             comparisonPath.append(*comparisonFiles[j]);
 
             drp->fBase.fFilename = *baseFiles[i];
             drp->fBase.fFullPath = basePath;
             drp->fBase.fStatus = DiffResource::kExists_Status;
 
             drp->fComparison.fFilename = *comparisonFiles[j];
             drp->fComparison.fFullPath = comparisonPath;
             drp->fComparison.fStatus = DiffResource::kExists_Status;
 
-            SkAutoDataUnref baseFileBits(read_file(drp->fBase.fFullPath.c_str()));
+            sk_sp<SkData> baseFileBits(read_file(drp->fBase.fFullPath.c_str()));
             if (baseFileBits) {
                 drp->fBase.fStatus = DiffResource::kRead_Status;
             }
-            SkAutoDataUnref comparisonFileBits(read_file(drp->fComparison.fFullPath.c_str()));
+            sk_sp<SkData> comparisonFileBits(read_file(drp->fComparison.fFullPath.c_str()));
             if (comparisonFileBits) {
                 drp->fComparison.fStatus = DiffResource::kRead_Status;
             }
             if (nullptr == baseFileBits || nullptr == comparisonFileBits) {
                 if (nullptr == baseFileBits) {
                     drp->fBase.fStatus = DiffResource::kCouldNotRead_Status;
                     VERBOSE_STATUS("READ FAIL", ANSI_COLOR_RED, baseFiles[i]);
                 }
                 if (nullptr == comparisonFileBits) {
                     drp->fComparison.fStatus = DiffResource::kCouldNotRead_Status;
                     VERBOSE_STATUS("READ FAIL", ANSI_COLOR_RED, comparisonFiles[j]);
                 }
                 drp->fResult = DiffRecord::kCouldNotCompare_Result;
 
-            } else if (are_buffers_equal(baseFileBits, comparisonFileBits)) {
+            } else if (are_buffers_equal(baseFileBits.get(), comparisonFileBits.get())) {
                 drp->fResult = DiffRecord::kEqualBits_Result;
                 VERBOSE_STATUS("MATCH", ANSI_COLOR_GREEN, baseFiles[i]);
             } else {
                 AutoReleasePixels arp(drp);
-                get_bitmap(baseFileBits, drp->fBase, false);
-                get_bitmap(comparisonFileBits, drp->fComparison, false);
+                get_bitmap(baseFileBits.get(), drp->fBase, false);
+                get_bitmap(comparisonFileBits.get(), drp->fComparison, false);
                 VERBOSE_STATUS("DIFFERENT", ANSI_COLOR_RED, baseFiles[i]);
                 if (DiffResource::kDecoded_Status == drp->fBase.fStatus &&
                     DiffResource::kDecoded_Status == drp->fComparison.fStatus) {
                     create_and_write_diff_image(drp, dmp, colorThreshold,
                                                 outputDir, drp->fBase.fFilename);
                 } else {
                     drp->fResult = DiffRecord::kCouldNotCompare_Result;
                 }
             }
 
@@ skipping 342 matching lines @@
     // range [0...255] are wrapped (mod 256).  Do the conversion ourselves, to
     // make sure that we only return 0 when there were no failures.
     return (num_failing_results > 255) ? 255 : num_failing_results;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif