Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/DrawTextTest.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 "SkTypes.h"
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkPaint.h"
 #include "SkPoint.h"
 #include "SkRect.h"
-
-///////////////////////////////////////////////////////////////////////////////
+#include "SkTypes.h"
 
 static const SkColor bgColor = SK_ColorWHITE;
 
 static void create(SkBitmap* bm, SkIRect bound, SkBitmap::Config config) {
     bm->setConfig(config, bound.width(), bound.height());
     bm->allocPixels();
 }
 
 static void drawBG(SkCanvas* canvas) {
     canvas->drawColor(bgColor);
@@ skipping 27 matching lines @@
                 refColor = bgColor;
             }
             if (refColor != testColor) {
                 return false;
             }
         }
     }
     return true;
 }
 
-static void test_drawText(skiatest::Reporter* reporter) {
-
+DEF_TEST(DrawText, reporter) {
     SkPaint paint;
     paint.setColor(SK_ColorGRAY);
     paint.setTextSize(SkIntToScalar(20));
 
     SkIRect drawTextRect = SkIRect::MakeWH(64, 64);
     SkBitmap drawTextBitmap;
     create(&drawTextBitmap, drawTextRect, SkBitmap::kARGB_8888_Config);
     SkCanvas drawTextCanvas(drawTextBitmap);
 
     SkIRect drawPosTextRect = SkIRect::MakeWH(64, 64);
@@ skipping 26 matching lines @@
                     drawPosTextCanvas.drawPosText("A", 1, &point, paint);
 
                     REPORTER_ASSERT(reporter,
                         compare(drawTextBitmap, drawTextRect,
                                 drawPosTextBitmap, drawPosTextRect));
                 }
             }
         }
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("DrawText_DrawPosText", DrawTextTestClass, test_drawText)