Revert of Revert of move remaining virtual draw methods to onDraw

tests/RecordDrawTest.cpp

Index: tests/RecordDrawTest.cpp
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index d306cad6e9fd936efb1084a4b27b345f26f41fcf..ec3680c3a9da5caec62ee6949d9796e49b2fa82c 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -288,16 +288,14 @@
         SkCanvasMock(int width, int height) : SkCanvas(width, height) {
             this->resetTestValues();
         }
-        virtual ~SkCanvasMock() {}
-        virtual void drawImage(const SkImage* image, SkScalar left, SkScalar top,
-                               const SkPaint* paint = NULL) SK_OVERRIDE {
-
+
+        void onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
+                         const SkPaint* paint) SK_OVERRIDE {
             fDrawImageCalled = true;
         }
 
-        virtual void drawImageRect(const SkImage* image, const SkRect* src,
-                                   const SkRect& dst,
-                                   const SkPaint* paint = NULL) SK_OVERRIDE {
+        void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                             const SkPaint* paint) SK_OVERRIDE {
             fDrawImageRectCalled = true;
         }