Use DEFINE_TESTCLASS_SHORT macro in tests.

tests/PipeTest.cpp

-
 /*
  * Copyright 2012 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 "SamplePipeControllers.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGPipe.h"
 #include "SkPaint.h"
 #include "SkShader.h"
-#include "Test.h"
 
 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
 static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
     SkBitmap badBitmap;
     badBitmap.setConfig(SkBitmap::kNo_Config, 5, 5);
     pipeCanvas->drawBitmap(badBitmap, 0, 0);
 }
 
 // Ensure that pipe gracefully handles attempting to draw after endRecording is called on the
 // SkGPipeWriter.
@@ skipping 10 matching lines @@
 
     SkShader* shader = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMode,
                                                     SkShader::kClamp_TileMode);
     SkPaint paint;
     paint.setShader(shader)->unref();
     pipeCanvas->drawPaint(paint);
 
     pipeCanvas->drawBitmap(bm, 0, 0);
 }
 
-static void test_pipeTests(skiatest::Reporter*) {
+DEF_TEST(Pipe, reporter) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
     SkCanvas canvas(bitmap);
 
     PipeController pipeController(&canvas);
     SkGPipeWriter writer;
     SkCanvas* pipeCanvas = writer.startRecording(&pipeController);
     testDrawingBadBitmap(pipeCanvas);
     writer.endRecording();
 
     testDrawingAfterEndRecording(&canvas);
 }
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("PipeTest", PipeTestClass, test_pipeTests)