One signature for creating unit tests that run on premade GrContexts

tools/gpu/GrContextFactory.h

Index: tools/gpu/GrContextFactory.h
diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h
index 7c49faaf87a97f013bfe06ef595e789f577e4b4d..fe828195808491bcdfe8c82688c7999cc1237995 100644
--- a/tools/gpu/GrContextFactory.h
+++ b/tools/gpu/GrContextFactory.h
@@ -15,6 +15,17 @@
 #include "SkTArray.h"
 
 namespace sk_gpu_test {
+
+struct ContextInfo {
+    ContextInfo()
+        : fGrContext(nullptr), fGLContext(nullptr) { }
+    ContextInfo(GrContext* grContext, GLTestContext* glContext)
+        : fGrContext(grContext), fGLContext(glContext) { }
+    GrContext* fGrContext;
+    GLTestContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
+                               //! destroyContexts().
+};
+
 /**
  * This is a simple class that is useful in test apps that use different
  * GrContexts backed by different types of GL contexts. It manages creating the
@@ -109,16 +120,6 @@ public:
     void abandonContexts();
     void releaseResourcesAndAbandonContexts();
 
-    struct ContextInfo {
-        ContextInfo()
-            : fGrContext(nullptr), fGLContext(nullptr) { }
-        ContextInfo(GrContext* grContext, GLTestContext* glContext)
-            : fGrContext(grContext), fGLContext(glContext) { }
-        GrContext* fGrContext;
-        GLTestContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
-                               //! destroyContexts().
-    };
-
     /**
      * Get a context initialized with a type of GL context. It also makes the GL context current.
      */