Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/RoundRectTest.cpp

 /*
  * Copyright 2012 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 "SkMatrix.h"
 #include "SkRRect.h"
 
 static const SkScalar kWidth = 100.0f;
 static const SkScalar kHeight = 100.0f;
 
 static void test_inset(skiatest::Reporter* reporter) {
     SkRRect rr, rr2;
     SkRect r = { 0, 0, 100, 100 };
 
@@ skipping 527 matching lines @@
                      SkIntToScalar(27), SkIntToScalar(34) };
         SkVector radii[4] = { { 0, SkIntToScalar(1) },
                               { SkIntToScalar(2), SkIntToScalar(3) },
                               { SkIntToScalar(4), SkIntToScalar(5) },
                               { SkIntToScalar(6), SkIntToScalar(7) } };
         rrect.setRectRadii(r, radii);
         test_transform_helper(reporter, rrect);
     }
 }
 
-static void TestRoundRect(skiatest::Reporter* reporter) {
+DEF_TEST(RoundRect, reporter) {
     test_round_rect_basic(reporter);
     test_round_rect_rects(reporter);
     test_round_rect_ovals(reporter);
     test_round_rect_general(reporter);
     test_round_rect_iffy_parameters(reporter);
     test_inset(reporter);
     test_round_rect_contains_rect(reporter);
     test_round_rect_transform(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("RoundRect", TestRoundRectClass, TestRoundRect)