Revert of cc: Move SkShader construction to a single spot in PaintShader

cc/paint/paint_op_buffer_unittest.cc

 // Copyright 2017 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 "cc/paint/paint_op_buffer.h"
-#include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
 #include "cc/test/skia_common.h"
 #include "cc/test/test_skcanvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 
 using testing::_;
 using testing::Property;
 using testing::Mock;
 
@@ skipping 424 matching lines @@
   list->Finalize();
   PaintOpBuffer new_buffer;
   new_buffer.push<DrawDisplayItemListOp>(list);
   EXPECT_TRUE(new_buffer.HasDiscardableImages());
 }
 
 TEST(PaintOpBufferTest, DiscardableImagesTracking_OpWithFlags) {
   PaintOpBuffer buffer;
   PaintFlags flags;
   sk_sp<SkImage> image = CreateDiscardableImage(gfx::Size(100, 100));
-  flags.setShader(PaintShader::MakeImage(std::move(image),
-                                         SkShader::kClamp_TileMode,
-                                         SkShader::kClamp_TileMode, nullptr));
+  flags.setShader(
+      image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
   buffer.push<DrawRectOp>(SkRect::MakeWH(100, 100), flags);
   EXPECT_TRUE(buffer.HasDiscardableImages());
 }
 
 TEST(PaintOpBufferTest, SlowPaths) {
   auto buffer = sk_make_sp<PaintOpBuffer>();
   EXPECT_EQ(buffer->numSlowPaths(), 0);
 
   // Op without slow paths
   PaintFlags noop_flags;
@@ skipping 519 matching lines @@
   EXPECT_CALL(canvas, OnSaveLayer()).InSequence(s);
   EXPECT_CALL(canvas, OnDrawRectWithColor(1u)).InSequence(s);
   EXPECT_CALL(canvas, OnDrawRectWithColor(2u)).InSequence(s);
   EXPECT_CALL(canvas, willRestore()).InSequence(s);
   // We will restore back to the original save count regardless with 2 restores.
   EXPECT_CALL(canvas, willRestore()).InSequence(s);
   buffer.PlaybackRanges({0}, {0}, &canvas);
 }
 
 }  // namespace cc