Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/OSPathTest.cpp

 /*
  * Copyright 2013 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 "SkString.h"
 #include "SkOSFile.h"
-#include "Test.h"
 
 /**
  *  Test SkPathJoin and SkBasename.
  *  Will use SkPathJoin to append filename to dir, test that it works correctly,
  *  and tests using SkBasename on the result.
  *  @param reporter Reporter for test conditions.
  *  @param dir String representing the path to a folder. May or may not
  *      end with SkPATH_SEPARATOR.
  *  @param filename String representing the basename of a file. Must NOT
  *      contain SkPATH_SEPARATOR.
@@ skipping 22 matching lines @@
     REPORTER_ASSERT(reporter, basename.equals(filename));
 
     // basename will not contain a path separator
     REPORTER_ASSERT(reporter, !basename.contains(SkPATH_SEPARATOR));
 
     // Now take the basename of filename, which should be the same as filename.
     basename = SkOSPath::SkBasename(filename.c_str());
     REPORTER_ASSERT(reporter, basename.equals(filename));
 }
 
-static void test_os_path_utils_tests(skiatest::Reporter* reporter) {
+DEF_TEST(OSPath, reporter) {
     SkString dir("dir");
     SkString filename("file");
     test_dir_with_file(reporter, dir, filename);
 
     // Now make sure this works with a path separator at the end of dir.
     dir.appendUnichar(SkPATH_SEPARATOR);
     test_dir_with_file(reporter, dir, filename);
 
     // Test using no filename.
     test_dir_with_file(reporter, dir, SkString());
@@ skipping 12 matching lines @@
 
     // Basename of NULL is an empty string.
     SkString empty = SkOSPath::SkBasename(NULL);
     REPORTER_ASSERT(reporter, empty.size() == 0);
 
     // Test that NULL can be used for the directory and filename.
     SkString emptyPath = SkOSPath::SkPathJoin(NULL, NULL);
     REPORTER_ASSERT(reporter, emptyPath.size() == 1);
     REPORTER_ASSERT(reporter, emptyPath.contains(SkPATH_SEPARATOR));
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("OSPath", OSPathTestClass, test_os_path_utils_tests)