Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/HashCacheTest.cpp

Index: tests/HashCacheTest.cpp
diff --git a/tests/HashCacheTest.cpp b/tests/HashCacheTest.cpp
index 1a5c4701cd452a725b0b957aa2ac909e18392b87..437a80c6b79c01ca31f5ae8fb1203a313d08261f 100644
--- a/tests/HashCacheTest.cpp
+++ b/tests/HashCacheTest.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-
 #include "Test.h"
+#include "TestClassDef.h"
 
 // This is a GR test
 #if SK_SUPPORT_GPU
@@ -59,9 +59,7 @@ protected:
     int fKey;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-static void TestHashCache(skiatest::Reporter* reporter) {
-
+DEF_TEST(HashCache, reporter) {
     GrTHashTable<HashElement, HashKey, 4> cache;
 
     HashElement negHashElements[10] = {
@@ -154,8 +152,4 @@ static void TestHashCache(skiatest::Reporter* reporter) {
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("HashCache", HashCacheTestClass, TestHashCache)
-
 #endif