Revert of Revert[2] of "stop using drawSprite (at least w/ no filters) as it is going away"

tests/RecordReplaceDrawTest.cpp

Index: tests/RecordReplaceDrawTest.cpp
diff --git a/tests/RecordReplaceDrawTest.cpp b/tests/RecordReplaceDrawTest.cpp
index 86e022440c918e2db4c210a291dfb83a3a62bfb4..3074cfdc13b3e029f76591c70434eb3750743473 100644
--- a/tests/RecordReplaceDrawTest.cpp
+++ b/tests/RecordReplaceDrawTest.cpp
@@ -142,7 +142,7 @@
         assert_type<SkRecords::Save>(r, rerecord, 0);
         index += 1;
     }
-    assert_type<SkRecords::DrawBitmap>(r, rerecord, index + 0);
+    assert_type<SkRecords::DrawSprite>(r, rerecord, index + 0);
     assert_type<SkRecords::DrawRect>(r, rerecord, index + 1);
     if (4 == recount) {
         assert_type<SkRecords::Restore>(r, rerecord, 3);