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

gm/discard.cpp

Index: gm/discard.cpp
diff --git a/gm/discard.cpp b/gm/discard.cpp
index ff8fe4a4b842c8c9325f7f26161b208fc26969bc..58a08499c511f1abea2dacaefe20fa7c42a46bd5 100644
--- a/gm/discard.cpp
+++ b/gm/discard.cpp
@@ -25,18 +25,18 @@ public:
     DiscardGM() {
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; }
+    uint32_t onGetFlags() const SK_OVERRIDE { return kGPUOnly_Flag; }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("discard");
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(100, 100);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         GrContext* context = canvas->getGrContext();
         if (NULL == context) {
             return;