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

gm/techtalk1.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 "gm.h"
 
 #include "SkColorPriv.h"
@@ skipping 341 matching lines @@
         SkISize size = canvas->getDeviceSize();
         SkRect dst = SkRect::MakeWH(size.width(), size.height());
         SkRect src = SkRect::MakeWH(640, 480);
         SkMatrix matrix;
         matrix.setRectToRect(src, dst, SkMatrix::kCenter_ScaleToFit);
 
         canvas->concat(matrix);
         fProc(canvas, fShowGL, fFlags);
     }
 
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         return  kSkipPDF_Flag | kSkipPicture_Flag | kSkipPipe_Flag | kSkipTiled_Flag;
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 #define GM_CONCAT(X,Y) GM_CONCAT_IMPL(X,Y)
@@ skipping 15 matching lines @@
 ADD_GM(TalkGM, (2, true, 1))
 ADD_GM(TalkGM, (2, true, 2))
 ADD_GM(TalkGM, (2, true, 3))
 ADD_GM(TalkGM, (3, false))
 ADD_GM(TalkGM, (3, true))
 ADD_GM(TalkGM, (4, false))
 ADD_GM(TalkGM, (4, true))
 
 //static GM* MyFactory(void*) { return new TalkGM(0, false); }
 //static GMRegistry reg(MyFactory);