Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/WArrayTest.cpp

Index: tests/WArrayTest.cpp
diff --git a/tests/WArrayTest.cpp b/tests/WArrayTest.cpp
index 601786208fd3a2392dcce04a64d029875e3ca698..020953f720d32da73ad50ac811f95c2c8f0e6f4e 100644
--- a/tests/WArrayTest.cpp
+++ b/tests/WArrayTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 
 // Include the implementation so we can make an appropriate template instance.
 #include "SkAdvancedTypefaceMetrics.h"
@@ -173,7 +174,7 @@ class TestWData {
     }
 };
 
-static void TestWArray(skiatest::Reporter* reporter) {
+DEF_TEST(WArray, reporter) {
     TestWData(reporter, data1, SK_ARRAY_COUNT(data1), NULL, 0, expected1);
     TestWData(reporter, data2, SK_ARRAY_COUNT(data2), NULL, 0, expected2);
     TestWData(reporter, data3, SK_ARRAY_COUNT(data3), NULL, 0, expected3);
@@ -205,6 +206,3 @@ static void TestWArray(skiatest::Reporter* reporter) {
     TestWData(reporter, data14, SK_ARRAY_COUNT(data14), subset14,
               SK_ARRAY_COUNT(subset14), expectedSubset14);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("WArray", WArrayTest, TestWArray)