Replace many skia::RefPtr with sk_sp<> in cc/

cc/output/filter_operations_unittest.cc

Index: cc/output/filter_operations_unittest.cc
diff --git a/cc/output/filter_operations_unittest.cc b/cc/output/filter_operations_unittest.cc
index 7b2fa1a8677d14a0d2303a9a12b9337207f5d046..64c9e99388890db06e4e19d70d0fb2b5a6addb01 100644
--- a/cc/output/filter_operations_unittest.cc
+++ b/cc/output/filter_operations_unittest.cc
@@ -5,7 +5,6 @@
 #include <stddef.h>
 
 #include "cc/output/filter_operations.h"
-#include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h"
@@ -38,11 +37,10 @@ TEST(FilterOperationsTest, MapRectBlur) {
 TEST(FilterOperationsTest, GetOutsetsDropShadowReferenceFilter) {
   // TODO(hendrikw): We need to make outsets for reference filters be in line
   // with non-reference filters. See crbug.com/523534
-  skia::RefPtr<SkImageFilter> filter =
-      skia::AdoptRef(SkDropShadowImageFilter::Create(
-          SkIntToScalar(3), SkIntToScalar(8), SkIntToScalar(4),
-          SkIntToScalar(9), SK_ColorBLACK,
-          SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode));
+  sk_sp<SkImageFilter> filter(SkDropShadowImageFilter::Create(

[f(malita), 2016/04/21 15:45:46]

SkDropShadowImageFilter::Make(...)

[tomhudson, 2016/04/25 20:20:50]

Done.

+      SkIntToScalar(3), SkIntToScalar(8), SkIntToScalar(4), SkIntToScalar(9),
+      SK_ColorBLACK,
+      SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode));
   FilterOperations ops;
   ops.Append(FilterOperation::CreateReferenceFilter(filter));

[f(malita), 2016/04/21 15:45:46]

(not particularly important for a test, but good for consistency/conditioning:)

move(filter)

[tomhudson, 2016/04/25 20:20:50]

How about I just inline the Make() call?

 
@@ -56,19 +54,17 @@ TEST(FilterOperationsTest, GetOutsetsDropShadowReferenceFilter) {
 }
 
 TEST(FilterOperationsTest, MapRectDropShadowReferenceFilter) {
-  skia::RefPtr<SkImageFilter> filter =
-      skia::AdoptRef(SkDropShadowImageFilter::Create(
-          SkIntToScalar(3), SkIntToScalar(8), SkIntToScalar(4),
-          SkIntToScalar(9), SK_ColorBLACK,
-          SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode));
+  sk_sp<SkImageFilter> filter(SkDropShadowImageFilter::Create(

[f(malita), 2016/04/21 15:45:46]

SkDropShadowImageFilter::Make(...)

[tomhudson, 2016/04/25 20:20:50]

Done.

+      SkIntToScalar(3), SkIntToScalar(8), SkIntToScalar(4), SkIntToScalar(9),
+      SK_ColorBLACK,
+      SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode));
   FilterOperations ops;
   ops.Append(FilterOperation::CreateReferenceFilter(filter));

[f(malita), 2016/04/21 15:45:46]

move(filter)

[tomhudson, 2016/04/25 20:20:50]

inlined again?

   EXPECT_EQ(gfx::Rect(-9, -19, 34, 64), ops.MapRect(gfx::Rect(0, 0, 10, 10)));
 }
 
 TEST(FilterOperationsTest, MapRectOffsetReferenceFilter) {
-  skia::RefPtr<SkImageFilter> filter =
-      skia::AdoptRef(SkOffsetImageFilter::Make(30, 40, nullptr));
+  sk_sp<SkImageFilter> filter = SkOffsetImageFilter::Make(30, 40, nullptr);
   FilterOperations ops;
   ops.Append(FilterOperation::CreateReferenceFilter(std::move(filter)));
   EXPECT_EQ(gfx::Rect(30, 40, 10, 10), ops.MapRect(gfx::Rect(0, 0, 10, 10)));
@@ -582,10 +578,8 @@ TEST(FilterOperationsTest, BlendSaturatingBrightnessWithNull) {
 }
 
 TEST(FilterOperationsTest, BlendReferenceFilters) {
-  skia::RefPtr<SkImageFilter> from_filter =
-      skia::AdoptRef(SkBlurImageFilter::Create(1.f, 1.f));
-  skia::RefPtr<SkImageFilter> to_filter =
-      skia::AdoptRef(SkBlurImageFilter::Create(2.f, 2.f));
+  sk_sp<SkImageFilter> from_filter(SkBlurImageFilter::Make(1.f, 1.f, nullptr));
+  sk_sp<SkImageFilter> to_filter(SkBlurImageFilter::Make(2.f, 2.f, nullptr));
   FilterOperation from = FilterOperation::CreateReferenceFilter(from_filter);
   FilterOperation to = FilterOperation::CreateReferenceFilter(to_filter);

[f(malita), 2016/04/21 15:45:46]

move(from_filter/to_filter).

[tomhudson, 2016/04/25 20:20:50]

Done.

 
@@ -603,11 +597,9 @@ TEST(FilterOperationsTest, BlendReferenceFilters) {
 }
 
 TEST(FilterOperationsTest, BlendReferenceWithNull) {
-  skia::RefPtr<SkImageFilter> image_filter =
-      skia::AdoptRef(SkBlurImageFilter::Create(1.f, 1.f));
+  sk_sp<SkImageFilter> image_filter(SkBlurImageFilter::Make(1.f, 1.f, nullptr));
   FilterOperation filter = FilterOperation::CreateReferenceFilter(image_filter);

[f(malita), 2016/04/21 15:45:46]

move(image_filter)

[tomhudson, 2016/04/25 20:20:50]

Done.

-  FilterOperation null_filter =
-      FilterOperation::CreateReferenceFilter(skia::RefPtr<SkImageFilter>());
+  FilterOperation null_filter = FilterOperation::CreateReferenceFilter(nullptr);
 
   FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
   EXPECT_EQ(filter, blended);