Revert of switch colorfilters to sk_sp

tests/PaintTest.cpp

Index: tests/PaintTest.cpp
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 0e92e65ba3ec500a16e4907cbfd2ccba88dad4cb..a58bd864ece75c165d8fe0ff58b3cdcc08d14a68 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -360,11 +360,11 @@
 
     SkColorMatrix cm;
     cm.setIdentity();   // does not change alpha
-    paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
+    paint.setColorFilter(SkColorMatrixFilter::Create(cm))->unref();
     REPORTER_ASSERT(r, paint.nothingToDraw());
 
     cm.postTranslate(0, 0, 0, 1);    // wacks alpha
-    paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
+    paint.setColorFilter(SkColorMatrixFilter::Create(cm))->unref();
     REPORTER_ASSERT(r, !paint.nothingToDraw());
 }