Follow up.

tests/BitmapHeapTest.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 "SkBitmap.h"
 #include "SkBitmapHeap.h"
 #include "SkColor.h"
 #include "SkFlattenable.h"
 #include "SkWriteBuffer.h"
 #include "SkPictureFlat.h"
 #include "SkRefCnt.h"
 #include "SkShader.h"
 #include "Test.h"
 
 struct SimpleFlatController : public SkFlatController {
     SimpleFlatController() : SkFlatController() {}
-    virtual void* allocThrow(size_t bytes) { return sk_malloc_throw(bytes); }
-    virtual void unalloc(void* ptr) { sk_free(ptr); }
+    virtual void* allocThrow(size_t bytes) SK_OVERRIDE { return sk_malloc_throw(bytes); }
+    virtual void unalloc(void* ptr) SK_OVERRIDE { sk_free(ptr); }
     void setBitmapStorage(SkBitmapHeap* h) { this->setBitmapHeap(h); }
 };
 
 struct SkShaderTraits {
     static void Flatten(SkWriteBuffer& buffer, const SkShader& shader) {
         buffer.writeFlattenable(&shader);
     }
 };
 typedef SkFlatDictionary<SkShader, SkShaderTraits> FlatDictionary;
 
@@ skipping 50 matching lines @@
     heap.deferAddingOwners();
     index = dictionary.find(*bitmapShader);
     heap.endAddingOwnersDeferral(false);
 
     // The dictionary should report the same index since the new entry is identical.
     // The bitmap heap should contain the bitmap, but with no references.
     REPORTER_ASSERT(reporter, 1 == index);
     REPORTER_ASSERT(reporter, heap.count() == 1);
     REPORTER_ASSERT(reporter, SkBitmapHeapTester::GetRefCount(heap.getEntry(0)) == 0);
 }