Add a DEF_GPUTEST() macro.

tests/GrContextFactoryTest.cpp

Index: tests/GrContextFactoryTest.cpp
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp
index 02b8c287ff9e64fabf1504478950186e9af6bce9..9ffbd64f9b05a4fe69e17f6460029877b85262da 100644
--- a/tests/GrContextFactoryTest.cpp
+++ b/tests/GrContextFactoryTest.cpp
@@ -5,34 +5,29 @@
  * found in the LICENSE file.
  */
 
-#include "Test.h"
-
-// This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
+
 #include "GrContextFactory.h"
+#include "Test.h"
+#include "TestClassDef.h"
 
-static void test_context_factory(skiatest::Reporter* reporter,
-                                 GrContextFactory* contextFactory) {
+DEF_GPUTEST(GrContextFactoryTest, reporter, factory) {
     // Reset in case some other test has been using it first.
-    contextFactory->destroyContexts();
+    factory->destroyContexts();
 
     // Before we ask for a context, we expect the GL context to not be there.
     REPORTER_ASSERT(reporter,
-                    NULL == contextFactory->getGLContext(GrContextFactory::kNative_GLContextType));
+                    NULL == factory->getGLContext(GrContextFactory::kNative_GLContextType));
 
     // After we ask for a context, we expect that the GL context to be there.
-    contextFactory->get(GrContextFactory::kNative_GLContextType);
+    factory->get(GrContextFactory::kNative_GLContextType);
     REPORTER_ASSERT(reporter,
-                    contextFactory->getGLContext(GrContextFactory::kNative_GLContextType) != NULL);
+                    factory->getGLContext(GrContextFactory::kNative_GLContextType) != NULL);
 
     // If we did not ask for a context with the particular GL context, we would
     // expect the particular GL context to not be there.
     REPORTER_ASSERT(reporter,
-                    NULL == contextFactory->getGLContext(GrContextFactory::kNull_GLContextType));
+                    NULL == factory->getGLContext(GrContextFactory::kNull_GLContextType));
 }
 
-
-#include "TestClassDef.h"
-DEFINE_GPUTESTCLASS("GrContextFactory", GrContextFactoryClass, test_context_factory);
-
 #endif