Don't test the old picture backend anymore.

dm/DMUtil.cpp

 #include "DMUtil.h"
 
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 
 DEFINE_string(matrix, "1 0 0 0 1 0 0 0 1",
               "Matrix to apply to the canvas before drawing.");
 
@@ skipping 16 matching lines @@
 }
 
 SkString FileToTaskName(SkString filename) {
     for (size_t i = 0; i < filename.size(); i++) {
         if ('_' == filename[i]) { filename[i] = '-'; }
         if ('.' == filename[i]) { filename[i] = '_'; }
     }
     return filename;
 }
 
-SkPicture* RecordPicture(skiagm::GM* gm, SkBBHFactory* factory, bool skr) {
+SkPicture* RecordPicture(skiagm::GM* gm, SkBBHFactory* factory) {
     const SkScalar w = SkIntToScalar(gm->getISize().width()),
                    h = SkIntToScalar(gm->getISize().height());
     SkPictureRecorder recorder;
 
-    SkCanvas* canvas = skr ? recorder.EXPERIMENTAL_beginRecording(w, h, factory)
-                           : recorder.  DEPRECATED_beginRecording(w, h, factory);
+    SkCanvas* canvas = recorder.beginRecording(w, h, factory);
     CanvasPreflight(canvas);
     canvas->concat(gm->getInitialTransform());
     gm->draw(canvas);
     canvas->flush();
     return recorder.endRecording();
 }
 
 void AllocatePixels(SkColorType ct, int width, int height, SkBitmap* bitmap) {
     bitmap->allocPixels(SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType));
     bitmap->eraseColor(0x00000000);
@@ skipping 56 matching lines @@
 
 bool BitmapsEqual(const SkBitmap& a, const SkBitmap& b) {
     if (a.info() != b.info()) {
         return false;
     }
     const SkAutoLockPixels lockA(a), lockB(b);
     return 0 == memcmp(a.getPixels(), b.getPixels(), a.getSize());
 }
 
 }  // namespace DM