Remove uses of SkImageDecoder from gms

gm/filterindiabox.cpp

Index: gm/filterindiabox.cpp
diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp
index c5d716642301ccf70c22994db3bc0f6db3af9947..e29cb7dc1abe759626779f2f44aba1cf0ff4ca82 100644
--- a/gm/filterindiabox.cpp
+++ b/gm/filterindiabox.cpp
@@ -10,8 +10,8 @@
 #include "Resources.h"
 #include "SkBitmapProcState.h"
 #include "SkBitmapScaler.h"
+#include "SkData.h"
 #include "SkGradientShader.h"
-#include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
@@ -99,21 +99,14 @@ protected:
       }
 
       void makeBitmap() {
-          SkImageDecoder* codec = nullptr;
-          SkString resourcePath = GetResourcePath(fFilename.c_str());
-          SkFILEStream stream(resourcePath.c_str());
-          if (stream.isValid()) {
-              codec = SkImageDecoder::Factory(&stream);
-          }
-          if (codec) {
-              stream.rewind();
-              codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
-              delete codec;
-          } else {
-              fBM.allocN32Pixels(1, 1);
-              *(fBM.getAddr32(0,0)) = 0xFF0000FF; // red == bad
-          }
-          fSize = fBM.height();
+        SkAutoTUnref<SkData> data(SkData::NewFromFileName(
+                GetResourcePath(fFilename.c_str()).c_str()));
+        SkAutoTDelete<SkImage> image(SkImage::NewFromEncoded(data));
+        if (!image || !image->asLegacyBitmap(&fBM, SkImage::kRW_LegacyBitmapMode)) {
+            fBM.allocN32Pixels(1, 1);
+            fBM.eraseARGB(255, 255, 0 , 0); // red == bad
+        }
+        fSize = fBM.height();
       }
   private:
     typedef skiagm::GM INHERITED;