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

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

[reed1, 2015-11-03 14:58:27]

Description was changed from

==========
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:
==========

to

==========
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=
==========

[reed1, 2015-11-03 14:58:30]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2015-11-03 14:58:35]

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

[commit-bot: I haz the power, 2015-11-03 15:12:20]

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

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

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/1420053009/ by reed@google.com.

The reason for reverting is: failing on msaa.