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 "SkScaledImageCache.h"
 
@@ skipping 44 matching lines @@
         make_bm(&tmp, DIM, DIM);
         id = cache.addAndLock(bm[0], scale, scale, tmp);
         REPORTER_ASSERT(reporter, NULL != id);
         cache.unlock(id);
     }
 
     cache.setByteLimit(0);
 }
 
 #include "TestClassDef.h"
-DEFINE_TESTCLASS("ImageCache", TestImageCacheClass, TestImageCache)
+DEFINE_TESTCLASS_SHORT(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);
 }