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

src/images/SkImageDecoder_astc.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkEndian.h"
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
 #include "SkTypes.h"
 
 #include "SkTextureCompressor.h"
 
 class SkASTCImageDecoder : public SkImageDecoder {
 public:
     SkASTCImageDecoder() { }
 
-    virtual Format getFormat() const SK_OVERRIDE {
+    Format getFormat() const SK_OVERRIDE {
         return kASTC_Format;
     }
 
 protected:
-    virtual Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+    Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
 
 private:
     typedef SkImageDecoder INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
 static const uint32_t kASTCMagicNumber = 0x5CA1AB13;
 
 static inline int read_24bit(const uint8_t* buf) {
@@ skipping 156 matching lines @@
 static SkImageDecoder_DecodeReg gReg(sk_libastc_dfactory);
 
 static SkImageDecoder::Format get_format_astc(SkStreamRewindable* stream) {
     if (is_astc(stream)) {
         return SkImageDecoder::kASTC_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_astc);