Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp

gm/imagefiltersscaled.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 "sk_tool_utils.h"
 #include "SkBlurImageFilter.h"
 #include "SkColor.h"
@@ skipping 68 matching lines @@
                 SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode),
             SkDisplacementMapEffect::Create(SkDisplacementMapEffect::kR_ChannelSelectorType,
                                             SkDisplacementMapEffect::kR_ChannelSelectorType,
                                             SkIntToScalar(12),
                                             gradient.get(),
                                             checkerboard.get()),
             SkDilateImageFilter::Create(1, 1, checkerboard.get()),
             SkErodeImageFilter::Create(1, 1, checkerboard.get()),
             SkOffsetImageFilter::Create(SkIntToScalar(32), 0),
             SkImageFilter::CreateMatrixFilter(resizeMatrix, kNone_SkFilterQuality),
-            SkPaintImageFilter::Create(noisePaint),
+            SkPaintImageFilter::Make(noisePaint).release(),
             SkLightingImageFilter::CreatePointLitDiffuse(pointLocation, white, surfaceScale, kd),
             SkLightingImageFilter::CreateSpotLitDiffuse(spotLocation, spotTarget, spotExponent,
                                                         cutoffAngle, white, surfaceScale, kd),
         };
 
         SkVector scales[] = {
             SkVector::Make(SkScalarInvert(2), SkScalarInvert(2)),
             SkVector::Make(SkIntToScalar(1), SkIntToScalar(1)),
             SkVector::Make(SkIntToScalar(1), SkIntToScalar(2)),
             SkVector::Make(SkIntToScalar(2), SkIntToScalar(1)),
@@ skipping 55 matching lines @@
 
     sk_sp<SkImage> fCheckerboard, fGradientCircle;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageFiltersScaledGM;)
 }