Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/BitmapGetColorTest.cpp

 /*
  * Copyright 2011 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 "SkBitmap.h"
 #include "SkRect.h"
 #include "SkRandom.h"
 
-static void TestGetColor(skiatest::Reporter* reporter) {
+DEF_TEST(GetColor, reporter) {
     static const struct Rec {
         SkBitmap::Config    fConfig;
         SkColor             fInColor;
         SkColor             fOutColor;
     } gRec[] = {
         // todo: add some tests that involve alpha, so we exercise the
         // unpremultiply aspect of getColor()
         {   SkBitmap::kA8_Config,           0xFF000000,     0xFF000000  },
         {   SkBitmap::kA8_Config,           0,              0           },
         {   SkBitmap::kRGB_565_Config,      0xFF00FF00,     0xFF00FF00  },
@@ skipping 14 matching lines @@
         bm.setConfig(gRec[i].fConfig, 2, 2);
         bm.setPixels(storage);
 
         bm.eraseColor(initColor);
         bm.eraseArea(area, gRec[i].fInColor);
 
         SkColor c = bm.getColor(1, 1);
         REPORTER_ASSERT(reporter, c == gRec[i].fOutColor);
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("GetColor", TestGetColorClass, TestGetColor)