Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ImageCacheTest.cpp

Index: tests/ImageCacheTest.cpp
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index 8f1591f70801312b9b1420e335b8bf69506e2cde..6087b7f37fe6bd24852ad0ffb8012f850ffe9fbe 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkDiscardableMemory.h"
 #include "SkScaledImageCache.h"
 
@@ -85,7 +86,7 @@ static SkDiscardableMemory* pool_factory(size_t bytes) {
     return gPool->create(bytes);
 }
 
-static void TestImageCache(skiatest::Reporter* reporter) {
+DEF_TEST(ImageCache, reporter) {
     static const size_t defLimit = DIM * DIM * 4 * COUNT + 1024;    // 1K slop
 
     {
@@ -104,9 +105,6 @@ static void TestImageCache(skiatest::Reporter* reporter) {
     }
 }
 
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ImageCache", TestImageCacheClass, TestImageCache)
-
 DEF_TEST(ImageCache_doubleAdd, r) {
     // Adding the same key twice should be safe.
     SkScaledImageCache cache(1024);