Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/XfermodeTest.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 "SkXfermode.h"
 
 static SkPMColor bogusXfermodeProc(SkPMColor src, SkPMColor dst) {
     return 42;
 }
 
 #define ILLEGAL_MODE    ((SkXfermode::Mode)-1)
 
 static void test_asMode(skiatest::Reporter* reporter) {
@@ skipping 37 matching lines @@
         SkXfermode* xfer = SkXfermode::Create(mode);
         REPORTER_ASSERT(reporter, SkXfermode::IsMode(xfer, mode));
         SkSafeUnref(xfer);
 
         if (SkXfermode::kSrcOver_Mode != mode) {
             REPORTER_ASSERT(reporter, !SkXfermode::IsMode(NULL, mode));
         }
     }
 }
 
-static void test_xfermodes(skiatest::Reporter* reporter) {
+DEF_TEST(Xfermode, reporter) {
     test_asMode(reporter);
     test_IsMode(reporter);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Xfermode", XfermodeTestClass, test_xfermodes)