C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

bench/SkipZeroesBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "Resources.h"
 #include "SkBitmap.h"
@@ skipping 18 matching lines @@
     , fSkipZeroes(skipZeroes)
     , fValid(false) {
         fName.append(filename);
         if (skipZeroes) {
             fName.append("_skip_zeroes");
         } else {
             fName.append("_write_zeroes");
         }
     }
 
-    bool isSuitableFor(Backend backend) SK_OVERRIDE {
+    bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
 
 protected:
-    const char* onGetName() SK_OVERRIDE {
+    const char* onGetName() override {
         return fName.c_str();
     }
 
-    void onPreDraw() SK_OVERRIDE {
+    void onPreDraw() override {
         SkString resourcePath = GetResourcePath();
         if (resourcePath.isEmpty()) {
             fValid = false;
             return;
         }
 
         SkString fullPath = SkOSPath::Join(resourcePath.c_str(), fFilename.c_str());
         SkFILEStream fileStream(fullPath.c_str());
         fValid = fileStream.isValid() && fileStream.getLength() > 0;
         if (fValid) {
             const size_t size = fileStream.getLength();
             void* data = sk_malloc_throw(size);
             if (fileStream.read(data, size) < size) {
                 fValid = false;
             } else {
                 SkAutoTUnref<SkData> skdata(SkData::NewFromMalloc(data, size));
                 fStream.setData(skdata.get());
                 fDecoder.reset(SkImageDecoder::Factory(&fStream));
                 if (fDecoder.get()) {
                     fDecoder->setSkipWritingZeroes(fSkipZeroes);
                 } else {
                     fValid = false;
                 }
             }
         }
     }
 
-    void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas*) override {
         if (!fValid) {
 #ifdef SK_DEBUG
             SkDebugf("stream was invalid: %s\n", fFilename.c_str());
 #endif
             return;
         }
         // Decode a bunch of times
         SkBitmap bm;
         for (int i = 0; i < loops; ++i) {
             SkDEBUGCODE(SkImageDecoder::Result result =) fDecoder->decode(&fStream, &bm,
@@ skipping 21 matching lines @@
     SkMemoryStream                  fStream;
     bool                            fSkipZeroes;
     bool                            fValid;
 
     typedef Benchmark INHERITED;
 };
 
 // Enable the true version once the feature is checked in.
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", true)));
 DEF_BENCH( return SkNEW_ARGS(SkipZeroesBench, ("arrow.png", false)));