Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ShaderImageFilterTest.cpp

-
 /*
  * 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
 
     SkBitmap filterResult, shaderResult;
 
     filterResult.setConfig(SkBitmap::kARGB_8888_Config, w, h);
     filterResult.allocPixels();
     SkCanvas canvasFilter(filterResult);
     canvasFilter.clear(0x00000000);
 
@@ skipping 29 matching lines @@
 
     // Assert that both paths yielded the same result
     for (int y = 0; y < r.height(); ++y) {
         const SkPMColor* filterPtr = filterResult.getAddr32(0, y);
         const SkPMColor* shaderPtr = shaderResult.getAddr32(0, y);
         for (int x = 0; x < r.width(); ++x, ++filterPtr, ++shaderPtr) {
             REPORTER_ASSERT(reporter, *filterPtr == *shaderPtr);
         }
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ShaderImageFilter", ShaderImageFilterTestClass, test_asShaderMode)