Revert of Update DisplacementMapEffect to sk_sp

bench/ImageFilterDAGBench.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 "Benchmark.h"
 #include "SkBlurImageFilter.h"
 #include "SkDisplacementMapEffect.h"
@@ skipping 44 matching lines @@
     const char* onGetName() override {
         return "image_filter_displaced_blur";
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
         for (int j = 0; j < loops; j++) {
             sk_sp<SkImageFilter> blur(SkBlurImageFilter::Make(4.0f, 4.0f, nullptr));
             auto xSelector = SkDisplacementMapEffect::kR_ChannelSelectorType;
             auto ySelector = SkDisplacementMapEffect::kB_ChannelSelectorType;
             SkScalar scale = 2;
-
+            sk_sp<SkImageFilter> displ(SkDisplacementMapEffect::Create(xSelector, ySelector, scale,
+                                                                       blur.get(), blur.get()));
             SkPaint paint;
-            paint.setImageFilter(SkDisplacementMapEffect::Make(xSelector, ySelector, scale,
-                                                               blur, blur));
-
+            paint.setImageFilter(std::move(displ));
             SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400));
             canvas->drawRect(rect, paint);
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH(return new ImageFilterDAGBench;)
 DEF_BENCH(return new ImageFilterDisplacedBlur;)