Revert of Update DisplacementMapEffect to sk_sp

fuzz/FilterFuzz.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 "Fuzz.h"
 #include "Sk1DPathEffect.h"
 #include "Sk2DPathEffect.h"
 #include "SkAlphaThresholdFilter.h"
@@ skipping 688 matching lines @@
         if (R(2) == 1) {
             filter = SkImageSource::Make(std::move(image),
                                          make_rect(),
                                          make_rect(),
                                          kHigh_SkFilterQuality);
         } else {
             filter = SkImageSource::Make(std::move(image));
         }
         break;
     }
-    case DISPLACE:
-        filter = SkDisplacementMapEffect::Make(make_channel_selector_type(),
-                                               make_channel_selector_type(),
-                                               make_scalar(),
-                                               make_image_filter(false),
-                                               make_image_filter());
+    case DISPLACE: {
+        sk_sp<SkImageFilter> subFilter1(make_image_filter(false));
+        sk_sp<SkImageFilter> subFilter2(make_image_filter());
+
+        filter = sk_sp<SkImageFilter>(SkDisplacementMapEffect::Create(make_channel_selector_type(),
+                                                                      make_channel_selector_type(),
+                                                                      make_scalar(),
+                                                                      subFilter1.get(),
+                                                                      subFilter2.get()));
         break;
+    }
     case TILE: {
         sk_sp<SkImageFilter> subFilter(make_image_filter(false));
 
         filter = sk_sp<SkImageFilter>(SkTileImageFilter::Create(make_rect(),
                                                                 make_rect(),
                                                                 subFilter.get()));
         break;
     }
     case PICTURE: {
         SkRTreeFactory factory;
@@ skipping 60 matching lines @@
 DEF_FUZZ(SerializedImageFilter, f) {
     fuzz = f;
     SkImageFilter* filter = make_serialized_image_filter();
 
     SkPaint paint;
     SkSafeUnref(paint.setImageFilter(filter));
     SkBitmap bitmap;
     SkCanvas canvas(bitmap);
     drawClippedBitmap(&canvas, 0, 0, paint);
 }