update callsites for Make image factories

gm/etc1bitmap.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 "gm.h"
 
 #include "Resources.h"
@@ skipping 80 matching lines @@
     SkISize onISize() override {
         return SkISize::Make(128, 128);
     }
 
     virtual SkString fileExtension() const = 0;
 
     void onDraw(SkCanvas* canvas) override {
         SkBitmap bm;
         SkString filename = GetResourcePath("mandrill_128.");
         filename.append(this->fileExtension());
-        SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
+        sk_sp<SkData> fileData(SkData::MakeFromFileName(filename.c_str()));
         if (nullptr == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
-        SkAutoTUnref<SkImage> image(SkImage::NewFromEncoded(fileData));
+        sk_sp<SkImage> image(SkImage::MakeFromEncoded(std::move(fileData)));
         if (nullptr == image) {
             SkDebugf("Could not decode the ETC file. ETC may not be included in this platform.\n");
             return;
         }
         canvas->drawImage(image, 0, 0);
     }
 
 private:
     typedef GM INHERITED;
 };
@@ skipping 76 matching lines @@
         int width, height;
         if (!slice_etc1_data(am.get(), &width, &height)) {
             SkDebugf("ETC1 Data is poorly formatted.\n");
             return;
         }
 
         SkASSERT(124 == width);
         SkASSERT(124 == height);
 
         size_t dataSz = etc1_get_encoded_data_size(width, height) + ETC_PKM_HEADER_SIZE;
-        SkAutoDataUnref nonPOTData(SkData::NewWithCopy(am.get(), dataSz));
-
-        SkAutoTUnref<SkImage> image(SkImage::NewFromEncoded(nonPOTData));
-        canvas->drawImage(image, 0, 0);
+        sk_sp<SkData> nonPOTData(SkData::MakeWithCopy(am.get(), dataSz));
+        canvas->drawImage(SkImage::MakeFromEncoded(std::move(nonPOTData)).get(), 0, 0);
     }
 
 private:
     typedef GM INHERITED;
 };
 #endif  // SK_IGNORE_ETC1_SUPPORT
 
 }  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new skiagm::ETC1Bitmap_PKM_GM;)
 DEF_GM(return new skiagm::ETC1Bitmap_KTX_GM;)
 DEF_GM(return new skiagm::ETC1Bitmap_R11_KTX_GM;)
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 DEF_GM(return new skiagm::ETC1Bitmap_NPOT_GM;)
 #endif  // SK_IGNORE_ETC1_SUPPORT