Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/TestSize.cpp

Index: tests/TestSize.cpp
diff --git a/tests/TestSize.cpp b/tests/TestSize.cpp
index 6a9a88773fe22631b84ff2c175e0f9e02d69a191..475517a075a59939a1d70685d96f2cefb5077205 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -1,11 +1,12 @@
-
 /*
  * 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 "SkSize.h"
 
 static void TestISize(skiatest::Reporter* reporter) {
@@ -30,7 +31,7 @@ static void TestISize(skiatest::Reporter* reporter) {
                     a.fWidth == b.fWidth && a.fHeight == b.fHeight);
 }
 
-static void TestSize(skiatest::Reporter* reporter) {
+DEF_TEST(Size, reporter) {
     TestISize(reporter);
 
     SkSize a, b;
@@ -61,7 +62,4 @@ static void TestSize(skiatest::Reporter* reporter) {
     ia.set(ix, iy);
     a.set(x, y);
     REPORTER_ASSERT(reporter, a.toRound() == ia);
-};
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Size", TestSizeClass, TestSize)
+}