Revert of Rename SkDrawPictureCallback to SkPicture::AbortCallback

tests/RecordDrawTest.cpp

Index: tests/RecordDrawTest.cpp
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 5f0195d0c2d1e6e50369d166ddf613ec6879eef8..ec3680c3a9da5caec62ee6949d9796e49b2fa82c 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -9,6 +9,7 @@
 #include "RecordTestUtils.h"
 
 #include "SkDebugCanvas.h"
+#include "SkDrawPictureCallback.h"
 #include "SkDropShadowImageFilter.h"
 #include "SkImagePriv.h"
 #include "SkRecord.h"
@@ -20,11 +21,11 @@
 
 static const int W = 1920, H = 1080;
 
-class JustOneDraw : public SkPicture::AbortCallback {
+class JustOneDraw : public SkDrawPictureCallback {
 public:
     JustOneDraw() : fCalls(0) {}
 
-    virtual bool abort() SK_OVERRIDE { return fCalls++ > 0; }
+    virtual bool abortDrawing() SK_OVERRIDE { return fCalls++ > 0; }
 private:
     int fCalls;
 };