Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/UnitTestTest.cpp

Index: tests/UnitTestTest.cpp
diff --git a/tests/UnitTestTest.cpp b/tests/UnitTestTest.cpp
index e3e1b97685f63f23dff4892fe6ba0a4875d4e6f9..f01b53d09fdb981ef975f49ea16f6083ff76034e 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)