Read pixels in BGRA non-premul mode in few tests

tests/ImageFilterTest.cpp

Index: tests/ImageFilterTest.cpp
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 2798ea0b18442055a050b9385eacdea5a027ff37..430481fcc6eda17fcfecff5281a4836fd4df9e2f 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -1010,7 +1010,7 @@ static void test_xfermode_cropped_input(SkBaseDevice* device, skiatest::Reporter
     canvas.drawSprite(bitmap, 0, 0, &paint);
 
     uint32_t pixel;
-    SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1);
+    SkImageInfo info = SkImageInfo::Make(1, 1, kBGRA_8888_SkColorType, kUnpremul_SkAlphaType);
     canvas.readPixels(info, &pixel, 4, 0, 0);
     REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
 
@@ -1059,7 +1059,7 @@ DEF_TEST(ImageFilterNestedSaveLayer, reporter) {
     strokePaint.setStyle(SkPaint::kStroke_Style);
     strokePaint.setColor(SK_ColorRED);
 
-    SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1);
+    SkImageInfo info = SkImageInfo::Make(1, 1, kBGRA_8888_SkColorType, kUnpremul_SkAlphaType);
     uint32_t pixel;
     canvas.readPixels(info, &pixel, 4, 25, 25);
     REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);