Fix up all the easy virtual ... SK_OVERRIDE cases.

gm/gm.h

Index: gm/gm.h
diff --git a/gm/gm.h b/gm/gm.h
index 9ba9f452a798bfb6d365511b1e7a6be3c5b4e4bf..703fc90451968d30442cc03d1448487f2565fa3c 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -27,11 +27,11 @@
 // See colorwheel.cpp for example usage.
 #define DEF_SIMPLE_GM(NAME, CANVAS, W, H)                     \
     class SK_MACRO_CONCAT(NAME, _GM) : public skiagm::GM {    \
-        virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE;    \
-        virtual SkISize onISize() SK_OVERRIDE {               \
+        void onDraw(SkCanvas* canvas) SK_OVERRIDE;    \
+        SkISize onISize() SK_OVERRIDE {               \
             return SkISize::Make((W), (H));                   \
         }                                                     \
-        virtual SkString onShortName() SK_OVERRIDE {          \
+        SkString onShortName() SK_OVERRIDE {          \
             return SkString(#NAME);                           \
         }                                                     \
     };                                                        \