Use DEFINE_TESTCLASS_SHORT macro in tests.

The three version of DEFINE_TESTCLASS macro is deprecated and thus just
use the simple, short one.

BUG=None
TEST=out/Debug/tests
R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/100113004

git-svn-id: http://skia.googlecode.com/svn/trunk@12653 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 03c93d4..eed9de3 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
@@ -235,7 +236,7 @@
     REPORTER_ASSERT(reporter, r.isEmpty());
 }
 
-static void TestPaint(skiatest::Reporter* reporter) {
+DEF_TEST(Paint, reporter) {
     // TODO add general paint tests
     test_copy(reporter);
 
@@ -251,6 +252,3 @@
        test_cmap(reporter);
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Paint", TestPaintClass, TestPaint)