Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/TSetTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * 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.
 // Functions that just call SkTDArray are not tested.
 
 static void TestTSet_basic(skiatest::Reporter* reporter) {
     SkTSet<int> set0;
     REPORTER_ASSERT(reporter,  set0.isEmpty());
     REPORTER_ASSERT(reporter, !set0.contains(-1));
     REPORTER_ASSERT(reporter, !set0.contains(0));
@@ skipping 102 matching lines @@
         REPORTER_ASSERT(reporter, set[i] == 2 * i);
         REPORTER_ASSERT(reporter, set[COUNT + i] == 2 * i + 1);
     }
 
 #ifdef SK_DEBUG
     set.validate();
     setOdd.validate();
 #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)