Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/HashCacheTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * 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"
 
 // This is a GR test
 #if SK_SUPPORT_GPU
 #include "GrTHashTable.h"
 
 struct HashElement {
     int     fKey;
     int     fValue;
 };
 
@@ skipping 32 matching lines @@
     }
     static bool Equals(const HashElement& a, const HashElement& b) {
         return a.fKey == b.fKey;
     }
 #endif
 
 protected:
     int fKey;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-static void TestHashCache(skiatest::Reporter* reporter) {
-
+DEF_TEST(HashCache, reporter) {
     GrTHashTable<HashElement, HashKey, 4> cache;
 
     HashElement negHashElements[10] = {
         { 0,  0 },
         { 1, -1 },
         { 2, -2 },
         { 3, -3 },
         { 4, -4 },
         { 5, -5 },
         { 6, -6 },
@@ skipping 72 matching lines @@
     {
         cache.remove(0, &negHashElements[0]);
         cache.remove(0, &posHashElements[0]);
         REPORTER_ASSERT(reporter, 18 == cache.count());
 
         HashElement* found = cache.find(0);
         REPORTER_ASSERT(reporter, NULL == found);
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("HashCache", HashCacheTestClass, TestHashCache)
-
 #endif