Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/ColorTest.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 "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkMathPriv.h"
 #include "SkRandom.h"
 #include "SkUnPreMultiply.h"
 
 #define GetPackedR16As32(packed)    (SkGetPackedR16(dc) << (8 - SK_R16_BITS))
 #define GetPackedG16As32(packed)    (SkGetPackedG16(dc) << (8 - SK_G16_BITS))
 #define GetPackedB16As32(packed)    (SkGetPackedB16(dc) << (8 - SK_B16_BITS))
 
@@ skipping 50 matching lines @@
         SkColor colorSrc = r.nextU();
         SkColor colorDst = r.nextU();
         SkPMColor src = SkPreMultiplyColor(colorSrc);
         SkPMColor dst = SkPreMultiplyColor(colorDst);
 
         REPORTER_ASSERT(reporter, SkFastFourByteInterp(src, dst, a0) == dst);
         REPORTER_ASSERT(reporter, SkFastFourByteInterp(src, dst, a255) == src);
     }
 }
 
-static void TestColor(skiatest::Reporter* reporter) {
+DEF_TEST(Color, reporter) {
     test_premul(reporter);
     //test_interp(reporter);
     test_fast_interp(reporter);
-//    test_565blend();
+    //test_565blend();
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Color", ColorTestClass, TestColor)