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/UnitTestTest.cpp b/tests/UnitTestTest.cpp
index e3e1b97..f01b53d 100644
--- a/tests/UnitTestTest.cpp
+++ b/tests/UnitTestTest.cpp
@@ -5,14 +5,12 @@
  * found in the LICENSE file.
  */
 
-#include "SkRTConf.h"
 #include "Test.h"
+#include "TestClassDef.h"
+#include "SkRTConf.h"
 
-static void test_runUnitTests(skiatest::Reporter* reporter) {
+DEF_TEST(UnitTest, reporter) {
 #ifdef SK_SUPPORT_UNITTEST
     SkRTConfRegistry::UnitTest();
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("UnitTest", UnitTestTestClass, test_runUnitTests)