Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/MetaDataTest.cpp

-
 /*
  * Copyright 2011 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 "SkMetaData.h"
 
 static void test_ptrs(skiatest::Reporter* reporter) {
     SkRefCnt ref;
     REPORTER_ASSERT(reporter, 1 == ref.getRefCnt());
 
     {
         SkMetaData md0, md1;
         const char name[] = "refcnt";
 
         md0.setRefCnt(name, &ref);
         REPORTER_ASSERT(reporter, md0.findRefCnt(name));
         REPORTER_ASSERT(reporter, md0.hasRefCnt(name, &ref));
         REPORTER_ASSERT(reporter, 2 == ref.getRefCnt());
 
         md1 = md0;
         REPORTER_ASSERT(reporter, md1.findRefCnt(name));
         REPORTER_ASSERT(reporter, md1.hasRefCnt(name, &ref));
         REPORTER_ASSERT(reporter, 3 == ref.getRefCnt());
 
         REPORTER_ASSERT(reporter, md0.removeRefCnt(name));
         REPORTER_ASSERT(reporter, !md0.findRefCnt(name));
         REPORTER_ASSERT(reporter, !md0.hasRefCnt(name, &ref));
         REPORTER_ASSERT(reporter, 2 == ref.getRefCnt());
     }
     REPORTER_ASSERT(reporter, 1 == ref.getRefCnt());
 }
 
-static void TestMetaData(skiatest::Reporter* reporter) {
+DEF_TEST(MetaData, reporter) {
     SkMetaData  m1;
 
     REPORTER_ASSERT(reporter, !m1.findS32("int"));
     REPORTER_ASSERT(reporter, !m1.findScalar("scalar"));
     REPORTER_ASSERT(reporter, !m1.findString("hello"));
     REPORTER_ASSERT(reporter, !m1.removeS32("int"));
     REPORTER_ASSERT(reporter, !m1.removeScalar("scalar"));
     REPORTER_ASSERT(reporter, !m1.removeString("hello"));
     REPORTER_ASSERT(reporter, !m1.removeString("true"));
     REPORTER_ASSERT(reporter, !m1.removeString("false"));
@@ skipping 59 matching lines @@
     REPORTER_ASSERT(reporter, m1.removeBool("false"));
 
     REPORTER_ASSERT(reporter, !m1.findS32("int"));
     REPORTER_ASSERT(reporter, !m1.findScalar("scalar"));
     REPORTER_ASSERT(reporter, !m1.findString("hello"));
     REPORTER_ASSERT(reporter, !m1.findBool("true"));
     REPORTER_ASSERT(reporter, !m1.findBool("false"));
 
     test_ptrs(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("MetaData", TestMetaDataClass, TestMetaData)