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

cc/output/filter_operations_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "third_party/skia/include/effects/SkOffsetImageFilter.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 namespace {
 
@@ skipping 12 matching lines @@
 TEST(FilterOperationsTest, MapRectBlur) {
   FilterOperations ops;
   ops.Append(FilterOperation::CreateBlurFilter(20));
   EXPECT_EQ(gfx::Rect(-57, -57, 124, 124),
             ops.MapRect(gfx::Rect(0, 0, 10, 10)));
 }
 
 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(
+      SkIntToScalar(3), SkIntToScalar(8), SkIntToScalar(4), SkIntToScalar(9),
+      SK_ColorBLACK,
+      SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode));
   FilterOperations ops;
   ops.Append(FilterOperation::CreateReferenceFilter(filter));
 
   int top, right, bottom, left;
   top = right = bottom = left = 0;
   ops.GetOutsets(&top, &right, &bottom, &left);
   EXPECT_EQ(35, top);
   EXPECT_EQ(9, right);
   EXPECT_EQ(19, bottom);
   EXPECT_EQ(15, left);
 }
 
 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(
+      SkIntToScalar(3), SkIntToScalar(8), SkIntToScalar(4), SkIntToScalar(9),
+      SK_ColorBLACK,
+      SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode));
   FilterOperations ops;
   ops.Append(FilterOperation::CreateReferenceFilter(filter));
   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)));
 }
 
 TEST(FilterOperationsTest, GetOutsetsNullReferenceFilter) {
   FilterOperations ops;
   ops.Append(FilterOperation::CreateReferenceFilter(nullptr));
 
   int top, right, bottom, left;
@@ skipping 493 matching lines @@
   FilterOperation expected =
       FilterOperation::CreateSaturatingBrightnessFilter(0.75f);
   EXPECT_EQ(expected, blended);
 
   blended = FilterOperation::Blend(NULL, &filter, 0.25);
   expected = FilterOperation::CreateSaturatingBrightnessFilter(0.25f);
   EXPECT_EQ(expected, blended);
 }
 
 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);
 
   FilterOperation blended = FilterOperation::Blend(&from, &to, -0.75);
   EXPECT_EQ(from, blended);
 
   blended = FilterOperation::Blend(&from, &to, 0.5);
   EXPECT_EQ(from, blended);
 
   blended = FilterOperation::Blend(&from, &to, 0.6);
   EXPECT_EQ(to, blended);
 
   blended = FilterOperation::Blend(&from, &to, 1.5);
   EXPECT_EQ(to, blended);
 }
 
 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);
   FilterOperation null_filter =
-      FilterOperation::CreateReferenceFilter(skia::RefPtr<SkImageFilter>());
+      FilterOperation::CreateReferenceFilter(sk_sp<SkImageFilter>());

[danakj, 2016/04/14 19:37:31]

nullptr

[tomhudson, 2016/04/25 20:48:10]

Done.

 
   FilterOperation blended = FilterOperation::Blend(&filter, NULL, 0.25);
   EXPECT_EQ(filter, blended);
   blended = FilterOperation::Blend(&filter, NULL, 0.75);
   EXPECT_EQ(null_filter, blended);
 
   blended = FilterOperation::Blend(NULL, &filter, 0.25);
   EXPECT_EQ(null_filter, blended);
   blended = FilterOperation::Blend(NULL, &filter, 0.75);
   EXPECT_EQ(filter, blended);
@@ skipping 150 matching lines @@
   blended = to.Blend(from, -0.75);
   EXPECT_EQ(to, blended);
   blended = to.Blend(from, 0.75);
   EXPECT_EQ(to, blended);
   blended = to.Blend(from, 1.5);
   EXPECT_EQ(to, blended);
 }
 
 }  // namespace
 }  // namespace cc