update callsites for Make image factories

bench/SKPBench.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 "SKPBench.h"
 #include "SkCommandLineFlags.h"
 #include "SkMultiPictureDraw.h"
@@ skipping 72 matching lines @@
             fSurfaces.top()->getCanvas()->setMatrix(canvas->getTotalMatrix());
             fSurfaces.top()->getCanvas()->scale(fScale, fScale);
         }
     }
 }
 
 void SKPBench::onPerCanvasPostDraw(SkCanvas* canvas) {
     // Draw the last set of tiles into the master canvas in case we're
     // saving the images
     for (int i = 0; i < fTileRects.count(); ++i) {
-        SkAutoTUnref<SkImage> image(fSurfaces[i]->newImageSnapshot());
+        sk_sp<SkImage> image(fSurfaces[i]->makeImageSnapshot());
         canvas->drawImage(image,
                           SkIntToScalar(fTileRects[i].fLeft), SkIntToScalar(fTileRects[i].fTop));
         SkSafeSetNull(fSurfaces[i]);
     }
 
     fSurfaces.rewind();
     fTileRects.rewind();
 }
 
 bool SKPBench::isSuitableFor(Backend backend) {
@@ skipping 86 matching lines @@
     context->freeGpuResources();
     context->resetContext();
     context->getGpu()->resetShaderCacheForTesting();
     draw_pic_for_stats(canvas, context, fPic, keys, values, "first_frame");
 
     // draw second frame
     draw_pic_for_stats(canvas, context, fPic, keys, values, "second_frame");
 
 #endif
 }