discardable pixelrefs are gone, update tests accordingly

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 85 matching lines @@
     void onDraw(SkCanvas* canvas) override {
         SkBitmap bm;
         SkString filename = GetResourcePath("mandrill_128.");
         filename.append(this->fileExtension());
         SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
         if (nullptr == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
-        if (!SkInstallDiscardablePixelRef(fileData, &bm)) {
-            SkDebugf("Could not install discardable pixel ref.\n");
-            return;
-        }
-
-        canvas->drawBitmap(bm, 0, 0);
+        SkAutoTUnref<SkImage> image(SkImage::NewFromEncoded(fileData));
+        canvas->drawImage(image, 0, 0);
     }
 
 private:
     typedef GM INHERITED;
 };
 
 // This class specializes ETC1BitmapGM to load the mandrill_128.pkm file.
 class ETC1Bitmap_PKM_GM : public ETC1BitmapGM {
 public:
     ETC1Bitmap_PKM_GM() : ETC1BitmapGM() { }
@@ skipping 73 matching lines @@
             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));
 
-        if (!SkInstallDiscardablePixelRef(nonPOTData, &bm)) {
-            SkDebugf("Could not install discardable pixel ref.\n");
-            return;
-        }
-
-        canvas->drawBitmap(bm, 0, 0);
+        SkAutoTUnref<SkImage> image(SkImage::NewFromEncoded(nonPOTData));
+        canvas->drawImage(image, 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