Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/Reader32Test.cpp

Index: tests/Reader32Test.cpp
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index d81287bd74f9bb06ae1bd8e5a6fc4813d809a628..b7a7c6ddc94e0336aefa33deb609d6902426c03a 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,10 +5,9 @@
  * found in the LICENSE file.
  */
 
-
-
-#include "SkReader32.h"
 #include "Test.h"
+#include "TestClassDef.h"
+#include "SkReader32.h"
 
 static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
     REPORTER_ASSERT(reporter, reader.eof());
@@ -35,7 +33,7 @@ static void assert_empty(skiatest::Reporter* reporter, const SkReader32& reader)
     assert_start(reporter, reader);
 }
 
-static void Tests(skiatest::Reporter* reporter) {
+DEF_TEST(Reader32, reporter) {
     SkReader32 reader;
     assert_empty(reporter, reader);
     REPORTER_ASSERT(reporter, NULL == reader.base());
@@ -82,6 +80,3 @@ static void Tests(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, NULL == reader.base());
     REPORTER_ASSERT(reporter, NULL == reader.peek());
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Reader32", Reader32Class, Tests)