Update SkImageSource to sk_sp

bench/MergeBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkImageSource.h"
@@ skipping 62 matching lines @@
                               SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
         SkPaint paint;
         paint.setImageFilter(this->mergeBitmaps());
         for (int i = 0; i < loops; i++) {
             canvas->drawRect(r, paint);
         }
     }
 
 private:
     sk_sp<SkImageFilter> mergeBitmaps() {
-        sk_sp<SkImageFilter> first(SkImageSource::Create(fCheckerboard.get()));
-        sk_sp<SkImageFilter> second(SkImageSource::Create(fImage.get()));
-        return SkMergeImageFilter::Make(std::move(first), std::move(second));
+        return SkMergeImageFilter::Make(SkImageSource::Make(fCheckerboard),
+                                        SkImageSource::Make(fImage));
     }
 
     bool fIsSmall;
     bool fInitialized;
     sk_sp<SkImage> fImage, fCheckerboard;
 
     typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new MergeBench(true); )
 DEF_BENCH( return new MergeBench(false); )