Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/RefCntTest.cpp

Index: tests/RefCntTest.cpp
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index ed771e77f87360796c00cbe0ee68df4ea73e8301..d844596fe0b11cbc1db006d6a6361819c2ddb454 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -5,15 +5,13 @@
  * found in the LICENSE file.
  */
 
-#include "SkTypes.h"
 #include "Test.h"
-
+#include "TestClassDef.h"
 #include "SkRefCnt.h"
+#include "SkTRefArray.h"
 #include "SkThreadUtils.h"
+#include "SkTypes.h"
 #include "SkWeakRefCnt.h"
-#include "SkTRefArray.h"
-
-///////////////////////////////////////////////////////////////////////////////
 
 class InstCounterClass {
 public:
@@ -143,11 +141,8 @@ static void test_weakRefCnt(skiatest::Reporter* reporter) {
     ref->unref();
 }
 
-static void test_refCntTests(skiatest::Reporter* reporter) {
+DEF_TEST(RefCnt, reporter) {
     test_refCnt(reporter);
     test_weakRefCnt(reporter);
     test_refarray(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("RefCnt", RefCntTestClass, test_refCntTests)