Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ImageCacheTest.cpp

  /*
  * Copyright 2013 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"
 #include "SkDiscardableMemory.h"
 #include "SkScaledImageCache.h"
 
 static void make_bm(SkBitmap* bm, int w, int h) {
     bm->setConfig(SkBitmap::kARGB_8888_Config, w, h);
     bm->allocPixels();
 }
 
 static const int COUNT = 10;
 static const int DIM = 256;
@@ skipping 59 matching lines @@
     cache.setByteLimit(0);
 }
 
 #include "SkDiscardableMemoryPool.h"
 
 static SkDiscardableMemoryPool* gPool;
 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
 
     {
         SkScaledImageCache cache(defLimit);
         test_cache(reporter, cache, true);
     }
     {
         SkDiscardableMemoryPool pool(defLimit);
         gPool = &pool;
         SkScaledImageCache cache(pool_factory);
         test_cache(reporter, cache, true);
     }
     {
         SkScaledImageCache cache(SkDiscardableMemory::Create);
         test_cache(reporter, cache, false);
     }
 }
 
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ImageCache", TestImageCacheClass, TestImageCache)
-
 DEF_TEST(ImageCache_doubleAdd, r) {
     // Adding the same key twice should be safe.
     SkScaledImageCache cache(1024);
 
     SkBitmap original;
     original.setConfig(SkBitmap::kARGB_8888_Config, 40, 40);
     original.allocPixels();
 
     SkBitmap scaled;
     scaled.setConfig(SkBitmap::kARGB_8888_Config, 20, 20);
     scaled.allocPixels();
 
     SkScaledImageCache::ID* id1 = cache.addAndLock(original, 0.5f, 0.5f, scaled);
     SkScaledImageCache::ID* id2 = cache.addAndLock(original, 0.5f, 0.5f, scaled);
     // We don't really care if id1 == id2 as long as unlocking both works.
     cache.unlock(id1);
     cache.unlock(id2);
 }