Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ClipperTest.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 "SkCanvas.h"
+#include "SkEdgeClipper.h"
+#include "SkLineClipper.h"
 #include "SkPath.h"
-#include "SkLineClipper.h"
-#include "SkEdgeClipper.h"
 
-#include "SkCanvas.h"
 static void test_hairclipping(skiatest::Reporter* reporter) {
     SkBitmap bm;
     bm.setConfig(SkBitmap::kARGB_8888_Config, 4, 4);
     bm.allocPixels();
     bm.eraseColor(SK_ColorWHITE);
 
     SkPaint paint;
     paint.setAntiAlias(true);
 
     SkCanvas canvas(bm);
@@ skipping 113 matching lines @@
         bool valid = SkLineClipper::IntersectLine(&gPartial[i], gR, dst);
         if (!valid || memcmp(&gPartial[i+2], dst, sizeof(dst))) {
             SkDebugf("++++ [%d] %g %g -> %g %g\n", i/2, dst[0].fX, dst[0].fY, dst[1].fX, dst[1].fY);
         }
         REPORTER_ASSERT(reporter, valid &&
                                   !memcmp(&gPartial[i+2], dst, sizeof(dst)));
     }
 
 }
 
-static void TestClipper(skiatest::Reporter* reporter) {
+DEF_TEST(Clipper, reporter) {
     test_intersectline(reporter);
     test_edgeclipper();
     test_hairclipping(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Clipper", TestClipperClass, TestClipper)