Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ShaderImageFilterTest.cpp

Index: tests/ShaderImageFilterTest.cpp
diff --git a/tests/ShaderImageFilterTest.cpp b/tests/ShaderImageFilterTest.cpp
index 49fc6e040b8dd16220de7cc9dda7d8c0309c4fb9..f0a17acef88b9727b1967b0f75afceaffefcf4e6 100644
--- a/tests/ShaderImageFilterTest.cpp
+++ b/tests/ShaderImageFilterTest.cpp
@@ -1,17 +1,18 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkCanvas.h"
 #include "SkShader.h"
 #include "SkRectShaderImageFilter.h"
 #include "SkGradientShader.h"
 
-static void test_asShaderMode(skiatest::Reporter* reporter) {
+DEF_TEST(ShaderImageFilter, reporter) {
     int w = 10, h = 10;
     SkRect r = SkRect::MakeWH(SkIntToScalar(w), SkIntToScalar(h)); // Make small 10x10 gradient
 
@@ -61,6 +62,3 @@ static void test_asShaderMode(skiatest::Reporter* reporter) {
         }
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ShaderImageFilter", ShaderImageFilterTestClass, test_asShaderMode)