Revert of Update DisplacementMapEffect to sk_sp

gm/imagefilterscropexpand.cpp

Index: gm/imagefilterscropexpand.cpp
diff --git a/gm/imagefilterscropexpand.cpp b/gm/imagefilterscropexpand.cpp
index f3084435fe86b77db488445272f317e7957409ef..3d5fcf3612f217071fcb27d90e31fc12d71a82fc 100644
--- a/gm/imagefilterscropexpand.cpp
+++ b/gm/imagefilterscropexpand.cpp
@@ -107,12 +107,13 @@
                                     &bigRect));
 
             Draw(canvas, checkerboard, rect,
-                 SkDisplacementMapEffect::Make(SkDisplacementMapEffect::kR_ChannelSelectorType,
-                                               SkDisplacementMapEffect::kR_ChannelSelectorType,
-                                               SkIntToScalar(12),
-                                               std::move(gradientCircleSource),
-                                               noopCropped,
-                                               &bigRect));
+                 sk_sp<SkImageFilter>(SkDisplacementMapEffect::Create(
+                                                SkDisplacementMapEffect::kR_ChannelSelectorType,
+                                                SkDisplacementMapEffect::kR_ChannelSelectorType,
+                                                SkIntToScalar(12),
+                                                gradientCircleSource.get(),
+                                                noopCropped.get(),
+                                                &bigRect)));
 
             Draw(canvas, checkerboard, rect,
                  SkOffsetImageFilter::Make(SkIntToScalar(-8), SkIntToScalar(16),