Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/GrMemoryPoolTest.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"
 // This is a GPU-backend specific test
 #if SK_SUPPORT_GPU
 #include "GrMemoryPool.h"
 #include "SkRandom.h"
 #include "SkTDArray.h"
 #include "SkTemplates.h"
 #include "SkInstCnt.h"
 
 // A is the top of an inheritance tree of classes that overload op new and
 // and delete to use a GrMemoryPool. The objects have values of different types
@@ skipping 156 matching lines @@
             // suppress warning
             return NULL;
     }
 }
 
 struct Rec {
     A* fInstance;
     int fValue;
 };
 
-static void test_memory_pool(skiatest::Reporter* reporter) {
+DEF_TEST(GrMemoryPool, reporter) {
     // prealloc and min alloc sizes for the pool
     static const size_t gSizes[][2] = {
         {0, 0},
         {10 * sizeof(A), 20 * sizeof(A)},
         {100 * sizeof(A), 100 * sizeof(A)},
         {500 * sizeof(A), 500 * sizeof(A)},
         {10000 * sizeof(A), 0},
         {1, 100 * sizeof(A)},
     };
     // different percentages of creation vs deletion
@@ skipping 36 matching lines @@
                 REPORTER_ASSERT(reporter, rec.fInstance->checkValues(rec.fValue));
                 delete rec.fInstance;
             }
 #if SK_ENABLE_INST_COUNT
             REPORTER_ASSERT(reporter, !A::GetInstanceCount());
 #endif
         }
     }
 }
 
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("GrMemoryPool", GrMemoryPoolClass, test_memory_pool)
-
 #endif