Use DEFINE_TESTCLASS_SHORT macro in tests.

The three version of DEFINE_TESTCLASS macro is deprecated and thus just
use the simple, short one.

BUG=None
TEST=out/Debug/tests
R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/100113004

git-svn-id: http://skia.googlecode.com/svn/trunk@12653 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index 8a16645..47d3226 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 @@
 #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)