Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/MatrixTest.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 "SkMath.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
 #include "SkRandom.h"
 
 static bool nearly_equal_scalar(SkScalar a, SkScalar b) {
     // Note that we get more compounded error for multiple operations when
     // SK_SCALAR_IS_FIXED.
 #ifdef SK_SCALAR_IS_FLOAT
     const SkScalar tolerance = SK_Scalar1 / 200000;
@@ skipping 663 matching lines @@
         for (int j = 0; j < kTripleCount; ++j) {
             SkScalar dst[3];
             mats[i].mapHomogeneousPoints(dst, &randTriples[j*3], 1);
             REPORTER_ASSERT(reporter, naive_homogeneous_mapping(mats[i], &randTriples[j*3], dst));
         }
     }
     }
 
 }
 
-static void TestMatrix(skiatest::Reporter* reporter) {
+DEF_TEST(Matrix, reporter) {
     SkMatrix    mat, inverse, iden1, iden2;
 
     mat.reset();
     mat.setTranslate(SK_Scalar1, SK_Scalar1);
     REPORTER_ASSERT(reporter, mat.invert(&inverse));
     iden1.setConcat(mat, inverse);
     REPORTER_ASSERT(reporter, is_identity(iden1));
 
     mat.setScale(SkIntToScalar(2), SkIntToScalar(4));
     REPORTER_ASSERT(reporter, mat.invert(&inverse));
@@ skipping 102 matching lines @@
 #else
     REPORTER_ASSERT(reporter, !are_equal(reporter, mat, mat2));
 #endif
 
     test_matrix_min_max_stretch(reporter);
     test_matrix_is_similarity(reporter);
     test_matrix_recttorect(reporter);
     test_matrix_decomposition(reporter);
     test_matrix_homogeneous(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Matrix", MatrixTestClass, TestMatrix)