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

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.
  */
 
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 124 matching lines @@
     GrRecordReplaceDraw(pic, &canvas, layerCache, SkMatrix::I(), nullptr/*callback*/);
 
     int recount = rerecord.count();
     REPORTER_ASSERT(r, 2 == recount || 4 == recount);
 
     int index = 0;
     if (4 == recount) {
         assert_type<SkRecords::Save>(r, rerecord, 0);
         index += 1;
     }
-    assert_type<SkRecords::DrawSprite>(r, rerecord, index + 0);
+    assert_type<SkRecords::DrawBitmap>(r, rerecord, index + 0);
     assert_type<SkRecords::DrawRect>(r, rerecord, index + 1);
     if (4 == recount) {
         assert_type<SkRecords::Restore>(r, rerecord, 3);
     }
 }
 
 DEF_GPUTEST(RecordReplaceDraw, r, factory) {
     for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
         GrContextFactory::GLContextType glType = static_cast<GrContextFactory::GLContextType>(type);
         if (!GrContextFactory::IsRenderingGLContext(glType)) {
             continue;
         }
         GrContext* context = factory->get(glType);
         if (nullptr == context) {
             continue;
         }
 
         test_replacements(r, context, true);
         test_replacements(r, context, false);
     }
 }
 
 #endif