Convert some unit tests from running on GL contexts to running on all contexts

tests/Test.h

Index: tests/Test.h
diff --git a/tests/Test.h b/tests/Test.h
index b2cb1803536828ad06e46b41e44d408400dbce6b..1363f8c080033ef0b8a76c1f4d8752a438fcedec 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -156,18 +156,20 @@ private:
             skiatest::Test(#name, true, test_##name));                                       \
     void test_##name(skiatest::Reporter* reporter, sk_gpu_test::GrContextFactory* factory)
 
-#define DEF_GPUTEST_FOR_CONTEXTS(name, contexts, reporter, context_info)            \
-    static void test_##name(skiatest::Reporter*,                                    \
-                            const sk_gpu_test::ContextInfo& context_info);          \
-    static void test_gpu_contexts_##name(skiatest::Reporter* reporter,              \
-                                         sk_gpu_test::GrContextFactory* factory) {  \
-        skiatest::RunWithGPUTestContexts(test_##name, contexts, reporter, factory); \
-    }                                                                               \
-    skiatest::TestRegistry name##TestRegistry(                                      \
-            skiatest::Test(#name, true, test_gpu_contexts_##name));                 \
-    void test_##name(skiatest::Reporter* reporter,                                  \
+#define DEF_GPUTEST_FOR_CONTEXTS(name, context_filter, reporter, context_info)            \
+    static void test_##name(skiatest::Reporter*,                                          \
+                            const sk_gpu_test::ContextInfo& context_info);                \
+    static void test_gpu_contexts_##name(skiatest::Reporter* reporter,                    \
+                                         sk_gpu_test::GrContextFactory* factory) {        \
+        skiatest::RunWithGPUTestContexts(test_##name, context_filter, reporter, factory); \
+    }                                                                                     \
+    skiatest::TestRegistry name##TestRegistry(                                            \
+            skiatest::Test(#name, true, test_gpu_contexts_##name));                       \
+    void test_##name(skiatest::Reporter* reporter,                                        \
                      const sk_gpu_test::ContextInfo& context_info)
 
+#define DEF_GPUTEST_FOR_ALL_CONTEXTS(name, reporter, context_info)                          \
+        DEF_GPUTEST_FOR_CONTEXTS(name, nullptr, reporter, context_info)
 #define DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(name, reporter, context_info)                       \
         DEF_GPUTEST_FOR_CONTEXTS(name, &skiatest::IsGLContextType, reporter, context_info)
 #define DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(name, reporter, context_info)                 \