Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/TSetTest.cpp

Index: tests/TSetTest.cpp
diff --git a/tests/TSetTest.cpp b/tests/TSetTest.cpp
index 8f276f7bc74e5bba1b43467c78fd5d549486e573..4026c6a6f89db3cc27d3542821fb6878a1136721 100644
--- a/tests/TSetTest.cpp
+++ b/tests/TSetTest.cpp
@@ -4,7 +4,9 @@
  * 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 "SkTSet.h"
 
 // Tests the SkTSet<T> class template.
@@ -127,11 +129,8 @@ static void TestTSet_merge(skiatest::Reporter* reporter) {
 #endif
 }
 
-static void TestTSet(skiatest::Reporter* reporter) {
+DEF_TEST(TSet, reporter) {
     TestTSet_basic(reporter);
     TestTSet_advanced(reporter);
     TestTSet_merge(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("TSet", TSetTest, TestTSet)