Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.

gm/factory.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 11 matching lines @@
  *  Draw a PNG created by SkBitmapFactory.
  */
 class FactoryGM : public GM {
 public:
     FactoryGM() {}
 
 protected:
     void onOnceBeforeDraw() override {
         // Copyright-free file from http://openclipart.org/detail/29213/paper-plane-by-ddoo
         SkString pngFilename = GetResourcePath("plane.png");
-        SkAutoDataUnref data(SkData::NewFromFileName(pngFilename.c_str()));
-        if (data.get()) {
+        sk_sp<SkData> data(SkData::MakeFromFileName(pngFilename.c_str()));
+        if (data) {
             // Create a cache which will boot the pixels out anytime the
             // bitmap is unlocked.
             SkAutoTUnref<SkDiscardableMemoryPool> pool(
                 SkDiscardableMemoryPool::Create(1));
             SkAssertResult(SkDEPRECATED_InstallDiscardablePixelRef(
-                                                        SkImageGenerator::NewFromEncoded(data),
-                                                        nullptr, &fBitmap, pool));
+                                                       SkImageGenerator::NewFromEncoded(data.get()),
+                                                       nullptr, &fBitmap, pool));
         }
     }
 
     SkString onShortName() override {
         return SkString("factory");
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
     void onDraw(SkCanvas* canvas) override {
         canvas->drawBitmap(fBitmap, 0, 0);
     }
 
 private:
     SkBitmap fBitmap;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FactoryGM; }
 static GMRegistry reg(MyFactory);
 
 }  // namespace skiagm