Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PathMeasureTest.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 "SkPathMeasure.h"
 
 static void test_small_segment3() {
 #ifdef SK_SCALAR_IS_FLOAT
     SkPath path;
     const SkPoint pts[] = {
         { 0, 0 },
         { 100000000000.0f, 100000000000.0f }, { 0, 0 }, { 10, 10 },
         { 10, 10 }, { 0, 0 }, { 10, 10 }
     };
@@ skipping 53 matching lines @@
         SkASSERT(d > 0);    // TRUE
         SkASSERT(seg->fDistance > prevSeg->fDistance);  // FALSE
 
         This 2nd assert failes because (distance += d) didn't affect distance
         because distance >>> d.
      */
     meas.getLength();
 #endif
 }
 
-static void TestPathMeasure(skiatest::Reporter* reporter) {
+DEF_TEST(PathMeasure, reporter) {
     SkPath  path;
 
     path.moveTo(0, 0);
     path.lineTo(SK_Scalar1, 0);
     path.lineTo(SK_Scalar1, SK_Scalar1);
     path.lineTo(0, SK_Scalar1);
 
     SkPathMeasure   meas(path, true);
     SkScalar        length = meas.getLength();
     SkASSERT(length == SK_Scalar1*4);
@@ skipping 107 matching lines @@
         SkScalarNearlyEqual(position.fY,
                             2.0f,
                             0.0001f));
     REPORTER_ASSERT(reporter, tangent.fX == -SK_Scalar1);
     REPORTER_ASSERT(reporter, tangent.fY == 0);
 
     test_small_segment();
     test_small_segment2();
     test_small_segment3();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("PathMeasure", PathMeasureTestClass, TestPathMeasure)