Revert of Rename SkDrawPictureCallback to SkPicture::AbortCallback

tests/RecordReplaceDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
 #include "Test.h"
 
 #include "GrContextFactory.h"
 #include "GrLayerCache.h"
 #include "GrRecordReplaceDraw.h"
 #include "RecordTestUtils.h"
 #include "SkBBHFactory.h"
 #include "SkPictureRecorder.h"
 #include "SkRecordDraw.h"
 #include "SkRecorder.h"
 #include "SkUtils.h"
 
 static const int kWidth = 100;
 static const int kHeight = 100;
 
-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;
 };
 
 // Make sure the abort callback works
 DEF_TEST(RecordReplaceDraw_Abort, r) {
     SkAutoTUnref<const SkPicture> pic;
 
     {
         // Record two commands.
@@ skipping 118 matching lines @@
         if (NULL == context) {
             continue;
         }
 
         test_replacements(r, context, true);
         test_replacements(r, context, false);
     }
 }
 
 #endif