Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ClipCubicTest.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 "SkPaint.h"
 #include "SkCubicClipper.h"
 #include "SkGeometry.h"
 
 // Currently the supersampler blitter uses int16_t for its index into an array
 // the width of the clip. Test that we don't crash/assert if we try to draw
 // with a device/clip that is larger.
 static void test_giantClip() {
     SkBitmap bm;
@@ skipping 42 matching lines @@
                          float x3, float y3,
                          SkPoint crv[4]) {
     crv[0].fX = x0;   crv[0].fY = y0;
     crv[1].fX = x1;   crv[1].fY = y1;
     crv[2].fX = x2;   crv[2].fY = y2;
     crv[3].fX = x3;   crv[3].fY = y3;
     return crv;
 }
 
 
-static void TestCubicClipping(skiatest::Reporter* reporter) {
+DEF_TEST(ClipCubic, reporter) {
     static SkPoint crv[4] = {
         { SkIntToScalar(0), SkIntToScalar(0)  },
         { SkIntToScalar(2), SkIntToScalar(3)  },
         { SkIntToScalar(1), SkIntToScalar(10) },
         { SkIntToScalar(4), SkIntToScalar(12) }
     };
 
     SkCubicClipper clipper;
     SkPoint clipped[4], shouldbe[4];
     SkIRect clipRect;
@@ skipping 73 matching lines @@
     REPORTER_ASSERT(reporter, success == true);
     REPORTER_ASSERT(reporter, CurvesAreEqual(clipped, SetCurve(
         0,           0,
         1.551193237f, 2.326789856f,
         1.297736168f, 7.059780121f,
         2.505550385f, 10,
         shouldbe), tol));
 
     test_giantClip();
 }
-
-
-
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("CubicClipper", CubicClippingTestClass, TestCubicClipping)