Add a DEF_GPUTEST() macro.

tests/GrSurfaceTest.cpp

Index: tests/GrSurfaceTest.cpp
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index 3fe071ca0f63c82b408ece4c3a23f9e55f934174..07bf0ce913f1a0a2998bed3d1cf32462eae1b16f 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2013 Google Inc.
  *
@@ -6,19 +5,17 @@
  * found in the LICENSE file.
  */
 
-// This is a GPU-backend specific test.
-
-#include "SkTypes.h"
-
 #if SK_SUPPORT_GPU
 
-#include "Test.h"
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
 #include "GrTexture.h"
+#include "SkTypes.h"
+#include "Test.h"
+#include "TestClassDef.h"
 
-static void GrSurfaceIsSameTest(skiatest::Reporter* reporter, GrContextFactory* factory) {
+DEF_GPUTEST(GrSurfaceTest, reporter, factory) {
     GrContext* context = factory->get(GrContextFactory::kNull_GLContextType);
     if (NULL != context) {
         GrTextureDesc desc;
@@ -62,7 +59,4 @@ static void GrSurfaceIsSameTest(skiatest::Reporter* reporter, GrContextFactory*
     }
 }
 
-#include "TestClassDef.h"
-DEFINE_GPUTESTCLASS("GrSurfaceIsSame", GrSurfaceIsSameTestClass, GrSurfaceIsSameTest)
-
 #endif