Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PictureUtilsTest.cpp

Index: tests/PictureUtilsTest.cpp
diff --git a/tests/PictureUtilsTest.cpp b/tests/PictureUtilsTest.cpp
index bb01bc902f4a870bc14a828ca4408e9e80889330..65771c3467bf897e973c5c219b0d9e4c42189d66 100644
--- a/tests/PictureUtilsTest.cpp
+++ b/tests/PictureUtilsTest.cpp
@@ -4,7 +4,9 @@
  * 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 "picture_utils.h"
 #include "SkString.h"
 
@@ -45,10 +47,7 @@ static void test_get_basename(skiatest::Reporter* reporter) {
 #endif
 }
 
-static void TestPictureUtils(skiatest::Reporter* reporter) {
+DEF_TEST(PictureUtils, reporter) {
     test_filepath_creation(reporter);
     test_get_basename(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("PictureUtils", PictureUtilsTestClass, TestPictureUtils)