Add a DEF_GPUTEST() macro.

tests/GpuColorFilterTest.cpp

Index: tests/GpuColorFilterTest.cpp
diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index 9fb1c770e14fb14463818a3dfcc71a0c61da9280..0d8acc5d014c2ddb4ae846a47edee2bc561ba4ed 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -12,10 +12,9 @@
 #include "GrContextFactory.h"
 #include "GrEffect.h"
 #include "SkColorFilter.h"
-#include "Test.h"
 #include "SkGr.h"
-
-namespace {
+#include "Test.h"
+#include "TestClassDef.h"
 
 static GrColor filterColor(const GrColor& color, uint32_t flags)  {
     uint32_t mask = 0;
@@ -110,7 +109,7 @@ static void test_getConstantColorComponents(skiatest::Reporter* reporter, GrCont
     }
 }
 
-static void TestGpuColorFilter(skiatest::Reporter* reporter, GrContextFactory* factory) {
+DEF_GPUTEST(GpuColorFilter, reporter, factory) {
     for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
         GrContextFactory::GLContextType glType = static_cast<GrContextFactory::GLContextType>(type);
 
@@ -123,9 +122,4 @@ static void TestGpuColorFilter(skiatest::Reporter* reporter, GrContextFactory* f
     }
 }
 
-}
-
-#include "TestClassDef.h"
-DEFINE_GPUTESTCLASS("GpuColorFilter", TestGpuColorFilterClass, TestGpuColorFilter)
-
 #endif