Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/SerializationTest.cpp

 /*
  * Copyright 2013 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 "SkBitmapDevice.h"
 #include "SkBitmapSource.h"
 #include "SkCanvas.h"
 #include "SkMallocPixelRef.h"
 #include "SkOrderedWriteBuffer.h"
 #include "SkValidatingReadBuffer.h"
 #include "SkXfermodeImageFilter.h"
-#include "Test.h"
 
 static const uint32_t kArraySize = 64;
 
 template<typename T>
 static void TestAlignment(T* testObj, skiatest::Reporter* reporter) {
     // Test memory read/write functions directly
     unsigned char dataWritten[1024];
     size_t bytesWrittenToMemory = testObj->writeToMemory(dataWritten);
     REPORTER_ASSERT(reporter, SkAlign4(bytesWrittenToMemory) == bytesWrittenToMemory);
     size_t bytesReadFromMemory = testObj->readFromMemory(dataWritten, bytesWrittenToMemory);
@@ skipping 199 matching lines @@
         SkBitmapDevice device(bitmap);
         SkCanvas canvas(&device);
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setImageFilter(deserializedFilter);
         canvas.clipRect(SkRect::MakeXYWH(0, 0, SkIntToScalar(24), SkIntToScalar(24)));
         canvas.drawBitmap(bitmap, 0, 0, &paint);
     }
 }
 
-static void Tests(skiatest::Reporter* reporter) {
+DEF_TEST(Serialization, reporter) {
     // Test matrix serialization
     {
         SkMatrix matrix = SkMatrix::I();
         TestObjectSerialization(&matrix, reporter);
      }
 
     // Test path serialization
     {
         SkPath path;
         TestObjectSerialization(&path, reporter);
@@ skipping 63 matching lines @@
         // Create a bitmap with a pixel ref too small
         SkBitmap invalidBitmap2;
         invalidBitmap2.setConfig(SkBitmap::kARGB_8888_Config, 256, 256);
         invalidBitmap2.setPixelRef(SkNEW_ARGS(SkMallocPixelRef,
             (NULL, 256, NULL)))->unref();
 
         // The deserialization should detect the pixel ref being too small and fail
         TestBitmapSerialization(validBitmap, invalidBitmap2, false, reporter);
     }
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Serialization", SerializationClass, Tests)