Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/TLSTest.cpp

Index: tests/TLSTest.cpp
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index d31a09f1880e536e7805eca9968dd252e0498ca1..6a423a586d3305528b1e83251f2e906761f8ccad 100644
--- a/tests/TLSTest.cpp
+++ b/tests/TLSTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkGraphics.h"
 #include "SkPaint.h"
 #include "SkTLS.h"
@@ -67,7 +68,7 @@ static void testTLSDestructor(void*) {
     SkTLS::Get(FakeCreateTLS, FakeDeleteTLS);
 }
 
-static void TestTLS(skiatest::Reporter* reporter) {
+DEF_TEST(TLS, reporter) {
     // TODO: Disabled for now to work around
     // http://code.google.com/p/skia/issues/detail?id=619
     // ('flaky segfault in TLS test on Shuttle_Ubuntu12 buildbots')
@@ -78,6 +79,3 @@ static void TestTLS(skiatest::Reporter* reporter) {
     test_threads(&testTLSDestructor);
     REPORTER_ASSERT(reporter, 0 == gCounter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("TLS", TLSClass, TestTLS)