[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp

Index: third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
index f79d682ddea09b8df86f34f6026742d09798a542..20efb7df4437f6477a8498e5eafb1e134153e145 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImageTest.cpp
@@ -9,6 +9,8 @@
 #include "platform/Timer.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/testing/UnitTestHelpers.h"
+#include "skia/ext/cdl_canvas.h"
+#include "skia/ext/cdl_paint.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/utils/SkNullCanvas.h"
@@ -28,9 +30,10 @@ class SVGImageTest : public ::testing::Test {
   void pumpFrame() {
     Image* image = m_image.get();
     std::unique_ptr<SkCanvas> nullCanvas = SkMakeNullCanvas();
-    SkPaint paint;
+    CdlPassThroughCanvas canvas(nullCanvas.get());
+    CdlPaint paint;
     FloatRect dummyRect(0, 0, 100, 100);
-    image->draw(nullCanvas.get(), paint, dummyRect, dummyRect,
+    image->draw(&canvas, paint, dummyRect, dummyRect,
                 DoNotRespectImageOrientation,
                 Image::DoNotClampImageToSourceRect);
   }