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

Revert of Revert[2] of "stop using drawSprite (at least w/ no filters) as it is going away" (patchset #1 id:1 of https://codereview.chromium.org/1410343011/ )

Reason for revert:
failing on msaa

Original issue's description:
> Revert[2] of "stop using drawSprite (at least w/ no filters) as it is going away"
> 
> Fixed assert in test that was calling GrRecordReplaceDraw(). That function now uses
> drawBitmap, so updated the test to check for that (instead of drawSprite).
> 
> This reverts commit 21b766347064837e6b78d600755901aad88cd6e0.
> 
> BUG=skia:
> TBR=
> 
> Committed: https://skia.googlesource.com/skia/+/7b81994d95f10cda80ddb85af68a2651ff31782f

TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/67b8b5e67a427382fed8c5d8b3c70a21ed2492c6

[reed1, 2015-11-03 19:26:50]

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

[commit-bot: I haz the power, 2015-11-03 19:26:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1420053009/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1420053009/1

[commit-bot: I haz the power, 2015-11-03 19:27:10]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/67b8b5e67a427382fed8c5d8b3c70a21ed2492c6