Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PictureUtilsTest.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 "picture_utils.h"
 #include "SkString.h"
 
 static void test_filepath_creation(skiatest::Reporter* reporter) {
     SkString result;
     SkString filename("test");
     SkString dir("test/path");
     sk_tools::make_filepath(&result, dir, filename);
     REPORTER_ASSERT(reporter, result.equals("test/path/test"));
 }
@@ skipping 20 matching lines @@
     sk_tools::get_basename(&result, path);
     REPORTER_ASSERT(reporter, result.equals("winbasename"));
 
     result.reset();
     path.set("path\\windir\\");
     sk_tools::get_basename(&result, path);
     REPORTER_ASSERT(reporter, result.equals("windir"));
 #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)