Switch a bunch of tests to use DEF_SIMPLE_GM.

Should be no user- or test-visible changes.

BUG=skia:

Change-Id: I6499dc978a41fee344b847c118f84227271561c5
Reviewed-on: https://skia-review.googlesource.com/6906
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Stephan White <senorblanco@chromium.org>

1 files changed, 10 insertions, 32 deletions

diff --git a/gm/thinconcavepaths.cpp b/gm/thinconcavepaths.cpp
index 6c81d7c272..0f4dd507bf 100644
--- a/gm/thinconcavepaths.cpp
+++ b/gm/thinconcavepaths.cpp
@@ -9,9 +9,6 @@
 #include "SkCanvas.h"
 #include "SkPath.h"
 
-#define WIDTH 400
-#define HEIGHT 400
-
 namespace {
 // Test thin stroked rect (stroked "by hand", not by stroking).
 void draw_thin_stroked_rect(SkCanvas* canvas, const SkPaint& paint, SkScalar width) {
@@ -29,35 +26,16 @@ void draw_thin_stroked_rect(SkCanvas* canvas, const SkPaint& paint, SkScalar wid
 
 };
 
-class ThinConcavePathsGM : public skiagm::GM {
-public:
-    ThinConcavePathsGM() {}
-
-protected:
-    SkString onShortName() override {
-        return SkString("thinconcavepaths");
-    }
-
-    SkISize onISize() override {
-        return SkISize::Make(WIDTH, HEIGHT);
-    }
-
-    void onDraw(SkCanvas* canvas) override {
-        SkPaint paint;
+DEF_SIMPLE_GM(thinconcavepaths, canvas, 400, 400) {
+    SkPaint paint;
 
-        paint.setAntiAlias(true);
-        paint.setStyle(SkPaint::kFill_Style);
+    paint.setAntiAlias(true);
+    paint.setStyle(SkPaint::kFill_Style);
 
-        canvas->save();
-        for (SkScalar width = 1.0; width < 2.05; width += 0.25) {
-            draw_thin_stroked_rect(canvas, paint, width);
-            canvas->translate(0, 25);
-        }
-        canvas->restore();
+    canvas->save();
+    for (SkScalar width = 1.0; width < 2.05; width += 0.25) {
+        draw_thin_stroked_rect(canvas, paint, width);
+        canvas->translate(0, 25);
     }
-
-private:
-    typedef skiagm::GM INHERITED;
-};
-
-DEF_GM( return new ThinConcavePathsGM; )
+    canvas->restore();
+}