Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PaintTest.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
 #include "SkPath.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkTypeface.h"
 #include "SkUtils.h"
 
 static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) {
@@ skipping 209 matching lines @@
     paint.setTextSize(12.0f);
 
     SkRect r;
     r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
 
     // test that the rect was reset
     paint.measureText("", 0, &r, 1.0f);
     REPORTER_ASSERT(reporter, r.isEmpty());
 }
 
-static void TestPaint(skiatest::Reporter* reporter) {
+DEF_TEST(Paint, reporter) {
     // TODO add general paint tests
     test_copy(reporter);
 
     // regression tests
     regression_cubic(reporter);
     regression_measureText(reporter);
 
     test_filterlevel(reporter);
 
     // need to implement charsToGlyphs on other backends (e.g. linux, win)
     // before we can run this tests everywhere
     if (false) {
        test_cmap(reporter);
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Paint", TestPaintClass, TestPaint)