use SK_OVERRIDE and DEF_GM

gm/aaclip.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 130 matching lines @@
             SkRect r = constr;
             while (r.fRight < SkIntToScalar(4)) {
                 path.addRect(r);
                 r.offset(dx, 0);
             }
             test_maskFromPath(path);
         }
     }
 }
 
-namespace skiagm {
-
 /** Draw a 2px border around the target, then red behind the target;
     set the clip to match the target, then draw >> the target in blue.
 */
 
 static void draw (SkCanvas* canvas, SkRect& target, int x, int y) {
     SkPaint borderPaint;
     borderPaint.setColor(SkColorSetRGB(0x0, 0xDD, 0x0));
     borderPaint.setAntiAlias(true);
     SkPaint backgroundPaint;
     backgroundPaint.setColor(SkColorSetRGB(0xDD, 0x0, 0x0));
@@ skipping 35 matching lines @@
     draw_bar(canvas, 10, 30);
 }
 
 /**
    Test a set of clipping problems discovered while writing blitAntiRect,
    and test all the code paths through the clipping blitters.
    Each region should show as a blue center surrounded by a 2px green
    border, with no red.
 */
 
-class AAClipGM : public GM {
+class AAClipGM : public skiagm::GM {
 public:
     AAClipGM() {
 
     }
 
 protected:
-    virtual SkString onShortName() {
+    virtual SkString onShortName() SK_OVERRIDE {
         return SkString("aaclip");
     }
 
-    virtual SkISize onISize() {
-        return make_isize(640, 480);
+    virtual SkISize onISize() SK_OVERRIDE {
+        return SkISize::Make(640, 480);
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         if (false) {
             SkRect bounds;
             canvas->getClipBounds(&bounds);
             test_shallow_gradient(canvas, bounds.width(), bounds.height()); return;
         }
         if (false) {
             test_giant_dash(canvas); return;
@@ skipping 22 matching lines @@
         draw_rect_tests(canvas);
 
         canvas->translate(SK_Scalar1 / 5, SK_Scalar1 / 5);
         canvas->translate(SkIntToScalar(50), 0);
         draw_rect_tests(canvas);
     }
 
     virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
 
 private:
-    typedef GM INHERITED;
+    typedef skiagm::GM INHERITED;
 };
 
-//////////////////////////////////////////////////////////////////////////////
-
-static GM* MyFactory(void*) { return new AAClipGM; }
-static GMRegistry reg(MyFactory);
-
-}
+DEF_GM( return SkNEW(AAClipGM); )