Add a DEF_GPUTEST() macro.

tests/GpuBitmapCopyTest.cpp

Index: tests/GpuBitmapCopyTest.cpp
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index 6e1d74dd977c3f942bfd557fc6f74154fbe0db25..1109102e98e70fd11059f3ac0d8ea3a658273758 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -18,6 +18,7 @@
 #include "SkPixelRef.h"
 #include "SkRect.h"
 #include "Test.h"
+#include "TestClassDef.h"
 
 static const char* boolStr(bool value) {
     return value ? "true" : "false";
@@ -98,7 +99,7 @@ static void TestIndividualCopy(skiatest::Reporter* reporter, const SkBitmap::Con
 
 // Stripped down version of TestBitmapCopy that checks basic fields (width, height, config, genID)
 // to ensure that they were copied properly.
-static void TestGpuBitmapCopy(skiatest::Reporter* reporter, GrContextFactory* factory) {
+DEF_GPUTEST(GpuBitmapCopy, reporter, factory) {
 #ifdef SK_BUILD_FOR_ANDROID // https://code.google.com/p/skia/issues/detail?id=753
     return;
 #endif
@@ -191,7 +192,4 @@ static void TestGpuBitmapCopy(skiatest::Reporter* reporter, GrContextFactory* fa
     } // GrContextFactory::GLContextType
 }
 
-#include "TestClassDef.h"
-DEFINE_GPUTESTCLASS("GpuBitmapCopy", TestGpuBitmapCopyClass, TestGpuBitmapCopy)
-
 #endif