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/TSetTest.cpp b/tests/TSetTest.cpp
index 8f276f7..4026c6a 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 @@
 #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)