Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ClampRangeTest.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 "gradients/SkClampRange.h"
 #include "SkRandom.h"
 
 static skiatest::Reporter* gReporter;
 
 static void debug_me() {
     if (NULL == gReporter) {
         SkDebugf("dsfdssd\n");
     }
 }
@@ skipping 54 matching lines @@
             fx += dx;
         }
         for (i = 0; i < range.fCount2; i++) {
             int v = classify_value(fx, V0, V1);
             R_ASSERT(v == range.fV1);
             fx += dx;
         }
     }
 }
 
+
 static void test_range(SkFixed fx, SkFixed dx, int count) {
     SkClampRange range;
     range.init(fx, dx, count, V0, V1);
     slow_check(range, fx, dx, count);
 }
 
 #define ff(x)   SkIntToFixed(x)
 
-void TestClampRange(skiatest::Reporter* reporter);
-void TestClampRange(skiatest::Reporter* reporter) {
+DEF_TEST(ClampRange, reporter) {
     gReporter = reporter;
 
     test_range(0, 0, 20);
     test_range(0xFFFF, 0, 20);
     test_range(-ff(2), 0, 20);
     test_range( ff(2), 0, 20);
 
     test_range(-10, 1, 20);
     test_range(10, -1, 20);
     test_range(-10, 3, 20);
@@ skipping 16 matching lines @@
     }
 
     // test overflow cases
     for (int i = 0; i < 100000; i++) {
         SkFixed fx = rand.nextS();
         SkFixed dx = rand.nextS();
         int count = rand.nextU() % 1000 + 1;
         test_range(fx, dx, count);
     }
 }
-
-#ifdef USE_REPORTER
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("ClampRange", ClampRangeClass, TestClampRange)
-
-#endif