Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ClipStackTest.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"
 #if SK_SUPPORT_GPU
     #include "GrReducedClip.h"
 #endif
 #include "SkClipStack.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkRect.h"
 #include "SkRegion.h"
 
-
 static void test_assign_and_comparison(skiatest::Reporter* reporter) {
     SkClipStack s;
     bool doAA = false;
 
     REPORTER_ASSERT(reporter, 0 == s.getSaveCount());
 
     // Build up a clip stack with a path, an empty clip, and a rect.
     s.save();
     REPORTER_ASSERT(reporter, 1 == s.getSaveCount());
 
@@ skipping 1123 matching lines @@
                                    inflatedIBounds,
                                    &reducedClips,
                                    &reducedGenID,
                                    &initial,
                                    &tightBounds);
 
     REPORTER_ASSERT(reporter, 0 == reducedClips.count());
 }
 
 #endif
-///////////////////////////////////////////////////////////////////////////////////////////////////
 
-static void TestClipStack(skiatest::Reporter* reporter) {
+DEF_TEST(ClipStack, reporter) {
     SkClipStack stack;
 
     REPORTER_ASSERT(reporter, 0 == stack.getSaveCount());
     assert_count(reporter, stack, 0);
 
     static const SkIRect gRects[] = {
         { 0, 0, 100, 100 },
         { 25, 25, 125, 125 },
         { 0, 0, 1000, 1000 },
         { 0, 0, 75, 75 }
@@ skipping 28 matching lines @@
     test_rect_replace(reporter);
     test_rect_inverse_fill(reporter);
     test_path_replace(reporter);
     test_quickContains(reporter);
 #if SK_SUPPORT_GPU
     test_reduced_clip_stack(reporter);
     test_reduced_clip_stack_genid(reporter);
     test_reduced_clip_stack_no_aa_crash(reporter);
 #endif
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ClipStack", TestClipStackClass, TestClipStack)