Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o…

bench/ColorFilterBench.cpp

Index: bench/ColorFilterBench.cpp
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp
index c4ba1e5dcb435e709aa103a9a5d54479c8290dd1..5365a9c2ad52082c79de59f2a4ce07490694c3c5 100644
--- a/bench/ColorFilterBench.cpp
+++ b/bench/ColorFilterBench.cpp
@@ -34,8 +34,8 @@
                                 0, 1, 0, 0, amount255,
                                 0, 0, 1, 0, amount255,
                                 0, 0, 0, 1, 0 };
-        auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
-        return SkColorFilterImageFilter::Create(filter.get(), input);
+        SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
+        return SkColorFilterImageFilter::Create(filter, input);
     }
 
     static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) {
@@ -45,13 +45,14 @@
         matrix[1] = matrix[6] = matrix[11] = 0.7152f;
         matrix[2] = matrix[7] = matrix[12] = 0.0722f;
         matrix[18] = 1.0f;
-        auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
-        return SkColorFilterImageFilter::Create(filter.get(), input);
+        SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
+        return SkColorFilterImageFilter::Create(filter, input);
     }
 
     static SkImageFilter* make_mode_blue(SkImageFilter* input = nullptr) {
-        auto filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
-        return SkColorFilterImageFilter::Create(filter.get(), input);
+        SkAutoTUnref<SkColorFilter> filter(
+            SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
+        return SkColorFilterImageFilter::Create(filter, input);
     }
 
     inline bool isSmall() const { return fIsSmall; }