Use sk_sp-based APIs for SkColorFilter

cc/trees/layer_tree_host_pixeltest_filters.cc

Index: cc/trees/layer_tree_host_pixeltest_filters.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc
index eecb6d423f8a2fca1b82865f735e1a2e5dedc8b3..647e81e7970576e324799e1c94edf3fbbfd66545 100644
--- a/cc/trees/layer_tree_host_pixeltest_filters.cc
+++ b/cc/trees/layer_tree_host_pixeltest_filters.cc
@@ -244,12 +244,12 @@ class ImageFilterClippedPixelTest : public LayerTreeHostFiltersPixelTest {
     memset(matrix, 0, 20 * sizeof(matrix[0]));
     // This filter does a red-blue swap, so the foreground becomes blue.
     matrix[2] = matrix[6] = matrix[10] = matrix[18] = SK_Scalar1;
-    skia::RefPtr<SkColorFilter> colorFilter(
-        skia::AdoptRef(SkColorMatrixFilter::Create(matrix)));
     // We filter only the bottom 200x100 pixels of the foreground.
     SkImageFilter::CropRect crop_rect(SkRect::MakeXYWH(0, 100, 200, 100));
-    skia::RefPtr<SkImageFilter> filter = skia::AdoptRef(
-        SkColorFilterImageFilter::Create(colorFilter.get(), NULL, &crop_rect));
+    skia::RefPtr<SkImageFilter> filter =
+        skia::AdoptRef(SkColorFilterImageFilter::Create(
+            SkColorFilter::MakeMatrixFilterRowMajor255(matrix).release(), NULL,

[f(malita), 2016/03/26 14:16:49]

Ditto.

+            &crop_rect));
     FilterOperations filters;
     filters.Append(FilterOperation::CreateReferenceFilter(filter));
 
@@ -604,15 +604,13 @@ class FilterWithGiantCropRectPixelTest : public LayerTreeHostFiltersPixelTest {
         0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 20.0f,
     };
 
-    skia::RefPtr<SkColorFilter> color_filter(
-        skia::AdoptRef(SkColorFilter::CreateMatrixFilterRowMajor255(matrix)));
-
     FilterOperations filters;
     SkImageFilter::CropRect cropRect(
         SkRect::MakeXYWH(-40000, -40000, 80000, 80000));
     skia::RefPtr<SkImageFilter> filter(
-        skia::AdoptRef(SkColorFilterImageFilter::Create(color_filter.get(),
-                                                        nullptr, &cropRect)));
+        skia::AdoptRef(SkColorFilterImageFilter::Create(
+            SkColorFilter::MakeMatrixFilterRowMajor255(matrix).release(),

[f(malita), 2016/03/26 14:16:49]

Ditto.

+            nullptr, &cropRect)));
     filters.Append(FilterOperation::CreateReferenceFilter(filter));
     filter_layer->SetFilters(filters);
     background->SetMasksToBounds(masks_to_bounds);