Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ScalarTest.cpp

Index: tests/ScalarTest.cpp
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index 8a166454d6528d3dd9ff10b8db723d9b38ea14ea..47d3226343d5de165466f56e2c06f6669635551a 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "TestClassDef.h"
 #include "SkFloatingPoint.h"
 #include "SkMath.h"
 #include "SkPoint.h"
@@ -187,9 +188,6 @@ static void test_isfinite(skiatest::Reporter* reporter) {
 #pragma warning ( pop )
 #endif
 
-static void TestScalar(skiatest::Reporter* reporter) {
+DEF_TEST(Scalar, reporter) {
     test_isfinite(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Scalar", TestScalarClass, TestScalar)