Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/FontHostStreamTest.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 "SkFontHost.h"
 #include "SkGraphics.h"
 #include "SkPaint.h"
 #include "SkPoint.h"
 #include "SkRect.h"
 #include "SkStream.h"
 #include "SkTypeface.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_fontHostStream(skiatest::Reporter* reporter) {
-
+DEF_TEST(FontHostStream, reporter) {
     {
         SkPaint paint;
         paint.setColor(SK_ColorGRAY);
         paint.setTextSize(SkIntToScalar(30));
 
         SkTypeface* fTypeface = SkTypeface::CreateFromName("Georgia",
                                                            SkTypeface::kNormal);
         SkSafeUnref(paint.setTypeface(fTypeface));
 
         SkIRect origRect = SkIRect::MakeWH(64, 64);
@@ skipping 24 matching lines @@
         SkSafeUnref(paint.setTypeface(streamTypeface));
         drawBG(&streamCanvas);
         streamCanvas.drawPosText("A", 1, &point, paint);
 
         REPORTER_ASSERT(reporter,
                         compare(origBitmap, origRect, streamBitmap, streamRect));
     }
     //Make sure the typeface is deleted and removed.
     SkGraphics::PurgeFontCache();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("FontHost::CreateTypefaceFromStream", FontHostStreamTestClass, test_fontHostStream)