Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/SHA1Test.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 "SkSHA1.h"
 
 static bool digests_equal(const SkSHA1::Digest& expectedDigest, const SkSHA1::Digest& computedDigest) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(expectedDigest.data); ++i) {
         if (expectedDigest.data[i] != computedDigest.data[i]) {
             return false;
         }
     }
     return true;
 }
@@ skipping 20 matching lines @@
     SkSHA1 context;
     for (unsigned long int i = 0; i < test.repeatCount; ++i) {
         context.update(reinterpret_cast<const uint8_t*>(test.message), len);
     }
     SkSHA1::Digest digest;
     context.finish(digest);
 
     REPORTER_ASSERT(reporter, digests_equal(test.digest, digest));
 }
 
-static void TestSHA1(skiatest::Reporter* reporter) {
+DEF_TEST(SHA1, reporter) {
     for (size_t i = 0; i < SK_ARRAY_COUNT(sha1_tests); ++i) {
         sha1_test(sha1_tests[i], reporter);
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("SHA1", SHA1TestClass, TestSHA1)