Use DEFINE_TESTCLASS_SHORT macro in tests.

The three version of DEFINE_TESTCLASS macro is deprecated and thus just
use the simple, short one.

BUG=None
TEST=out/Debug/tests
R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/100113004

git-svn-id: http://skia.googlecode.com/svn/trunk@12653 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index d31a09f..6a423a5 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 @@
     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 @@
     test_threads(&testTLSDestructor);
     REPORTER_ASSERT(reporter, 0 == gCounter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("TLS", TLSClass, TestTLS)