Generate list of GPU contexts outside tests

tests/ImageIsOpaqueTest.cpp

Index: tests/ImageIsOpaqueTest.cpp
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 48ac9f94bb0bcd54c4cd6fe633e9b014fe87e974..5d7003f20b9baa13956fd520d59a6bb99cdd502a 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -9,7 +9,7 @@
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
-#include "GrContextFactory.h"
+#include "GrContext.h"
 #endif
 #include "SkImage.h"
 #include "SkSurface.h"
@@ -65,31 +65,17 @@ DEF_TEST(ImageIsOpaqueTest, reporter) {
 
 #if SK_SUPPORT_GPU
 
-DEF_GPUTEST(ImageIsOpaqueTest_GPU, reporter, factory) {
-    for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) {
-        GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i;
-
-        if (!GrContextFactory::IsRenderingGLContext(glCtxType)) {
-            continue;
-        }
-
-        GrContext* context = factory->get(glCtxType);
-
-        if (nullptr == context) {
-            continue;
-        }
-
-        SkImageInfo infoTransparent = SkImageInfo::MakeN32Premul(5, 5);
-        SkAutoTUnref<SkSurface> surfaceTransparent(
-            SkSurface::NewRenderTarget(context,SkSurface::kNo_Budgeted, infoTransparent));
-        check_isopaque(reporter, surfaceTransparent, false);
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageIsOpaqueTest_Gpu, reporter, context) {
+    SkImageInfo infoTransparent = SkImageInfo::MakeN32Premul(5, 5);
+    SkAutoTUnref<SkSurface> surfaceTransparent(
+        SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, infoTransparent));
+    check_isopaque(reporter, surfaceTransparent, false);
 
-        SkImageInfo infoOpaque = SkImageInfo::MakeN32(5, 5, kOpaque_SkAlphaType);
-        SkAutoTUnref<SkSurface> surfaceOpaque(
-            SkSurface::NewRenderTarget(context,SkSurface::kNo_Budgeted, infoOpaque));
+    SkImageInfo infoOpaque = SkImageInfo::MakeN32(5, 5, kOpaque_SkAlphaType);
+    SkAutoTUnref<SkSurface> surfaceOpaque(
+        SkSurface::NewRenderTarget(context,SkSurface::kNo_Budgeted, infoOpaque));
 
-        check_isopaque(reporter, surfaceOpaque, true);
-    }
+    check_isopaque(reporter, surfaceOpaque, true);
 }
 
 #endif