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

tests/FrontBufferedStreamTest.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 "SkBitmap.h"
 #include "SkFrontBufferedStream.h"
 #include "SkImageDecoder.h"
@@ skipping 113 matching lines @@
 
 // A custom class whose isAtEnd behaves the way Android's stream does - since it is an adaptor to a
 // Java InputStream, it does not know that it is at the end until it has attempted to read beyond
 // the end and failed. Used by test_read_beyond_buffer.
 class AndroidLikeMemoryStream : public SkMemoryStream {
 public:
     AndroidLikeMemoryStream(void* data, size_t size, bool ownMemory)
         : INHERITED(data, size, ownMemory)
         , fIsAtEnd(false) {}
 
-    size_t read(void* dst, size_t requested) SK_OVERRIDE {
+    size_t read(void* dst, size_t requested) override {
         size_t bytesRead = this->INHERITED::read(dst, requested);
         if (bytesRead < requested) {
             fIsAtEnd = true;
         }
         return bytesRead;
     }
 
-    bool isAtEnd() const SK_OVERRIDE {
+    bool isAtEnd() const override {
         return fIsAtEnd;
     }
 
 private:
     bool fIsAtEnd;
     typedef SkMemoryStream INHERITED;
 };
 
 // This test ensures that buffering the exact length of the stream and attempting to read beyond it
 // does not invalidate the buffer.
@@ skipping 15 matching lines @@
 
 // Dummy stream that optionally has a length and/or position. Tests that FrontBufferedStream's
 // length depends on the stream it's buffering having a length and position.
 class LengthOptionalStream : public SkStream {
 public:
     LengthOptionalStream(bool hasLength, bool hasPosition)
         : fHasLength(hasLength)
         , fHasPosition(hasPosition)
     {}
 
-    bool hasLength() const SK_OVERRIDE {
+    bool hasLength() const override {
         return fHasLength;
     }
 
-    bool hasPosition() const SK_OVERRIDE {
+    bool hasPosition() const override {
         return fHasPosition;
     }
 
-    size_t read(void*, size_t) SK_OVERRIDE {
+    size_t read(void*, size_t) override {
         return 0;
     }
 
-    bool isAtEnd() const SK_OVERRIDE {
+    bool isAtEnd() const override {
         return true;
     }
 
 private:
     const bool fHasLength;
     const bool fHasPosition;
 };
 
 // Test all possible combinations of the wrapped stream having a length and a position.
 static void test_length_combos(skiatest::Reporter* reporter, size_t bufferSize) {
@@ skipping 56 matching lines @@
 
 // Test that a FrontBufferedStream does not allow reading after the end of a stream.
 // This class is a dummy SkStream which reports that it is at the end on the first
 // read (simulating a failure). Then it tracks whether someone calls read() again.
 class FailingStream : public SkStream {
 public:
     FailingStream()
     : fAtEnd(false)
     , fReadAfterEnd(false)
     {}
-    size_t read(void* buffer, size_t size) SK_OVERRIDE {
+    size_t read(void* buffer, size_t size) override {
         if (fAtEnd) {
             fReadAfterEnd = true;
         } else {
             fAtEnd = true;
         }
         return 0;
     }
 
-    bool isAtEnd() const SK_OVERRIDE {
+    bool isAtEnd() const override {
         return fAtEnd;
     }
 
     bool readAfterEnd() const {
         return fReadAfterEnd;
     }
 private:
     bool fAtEnd;
     bool fReadAfterEnd;
 };
 
 DEF_TEST(ShortFrontBufferedStream, reporter) {
     FailingStream* failingStream = SkNEW(FailingStream);
     SkAutoTDelete<SkStreamRewindable> stream(SkFrontBufferedStream::Create(failingStream, 64));
     SkBitmap bm;
     // The return value of DecodeStream is not important. We are just using DecodeStream because
     // it simulates a bug. DecodeStream will read the stream, then rewind, then attempt to read
     // again. FrontBufferedStream::read should not continue to read its underlying stream beyond
     // its end.
     SkImageDecoder::DecodeStream(stream, &bm);
     REPORTER_ASSERT(reporter, !failingStream->readAfterEnd());
 }