Use sk_sp-based shader creation APIs

skia/ext/pixel_ref_utils_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/test/geometry_test_utils.h"
 #include "skia/ext/pixel_ref_utils.h"
@@ skipping 23 matching lines @@
 
 skia::RefPtr<SkImage> CreateDiscardableImage(const gfx::Size& size) {
   const SkImageInfo info =
       SkImageInfo::MakeN32Premul(size.width(), size.height());
   return skia::AdoptRef(
       SkImage::NewFromGenerator(new TestImageGenerator(info)));
 }
 
 void SetDiscardableShader(SkPaint* paint) {
   skia::RefPtr<SkImage> image = CreateDiscardableImage(gfx::Size(50, 50));
-  skia::RefPtr<SkShader> shader = skia::AdoptRef(
-      image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
-  paint->setShader(shader.get());
+  paint->setShader(
+      image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
 }
 
 SkCanvas* StartRecording(SkPictureRecorder* recorder, gfx::Rect layer_rect) {
   SkCanvas* canvas =
       recorder->beginRecording(layer_rect.width(), layer_rect.height());
 
   canvas->save();
   canvas->translate(-layer_rect.x(), -layer_rect.y());
   canvas->clipRect(SkRect::MakeXYWH(
       layer_rect.x(), layer_rect.y(), layer_rect.width(), layer_rect.height()));
@@ skipping 579 matching lines @@
                        gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect));
   VerifyScales(2.f, 2.f, pixel_refs[2].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[2].filter_quality);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0, 30, 100, 100),
                        gfx::SkRectToRectF(pixel_refs[3].pixel_ref_rect));
   VerifyScales(2.f, 2.f, pixel_refs[3].matrix, __LINE__);
   EXPECT_EQ(kNone_SkFilterQuality, pixel_refs[3].filter_quality);
 }
 
 }  // namespace skia