[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp

Index: third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
diff --git a/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp b/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
index 5a26c8ca832b6b2b06483a8b0a6496391caca6b7..4a2c7d8cdb3b2178d9d493b64a353a07c8c7203d 100644
--- a/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
+++ b/third_party/WebKit/Source/platform/testing/TestPaintArtifact.cpp
@@ -11,8 +11,9 @@
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "skia/ext/cdl_paint.h"
+#include "skia/ext/cdl_picture.h"
+#include "skia/ext/cdl_picture_recorder.h"
 #include "wtf/Assertions.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
@@ -27,17 +28,17 @@ class TestPaintArtifact::DummyRectClient : public DisplayItemClient {
       : m_rect(rect), m_color(color) {}
   String debugName() const final { return "<dummy>"; }
   LayoutRect visualRect() const final { return enclosingLayoutRect(m_rect); }
-  sk_sp<SkPicture> makePicture() const;
+  sk_sp<CdlPicture> makePicture() const;
 
  private:
   FloatRect m_rect;
   Color m_color;
 };
 
-sk_sp<SkPicture> TestPaintArtifact::DummyRectClient::makePicture() const {
-  SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(m_rect);
-  SkPaint paint;
+sk_sp<CdlPicture> TestPaintArtifact::DummyRectClient::makePicture() const {
+  CdlPictureRecorder recorder;
+  CdlCanvas* canvas = recorder.beginRecording(m_rect);
+  CdlPaint paint;
   paint.setColor(m_color.rgb());
   canvas->drawRect(m_rect, paint);
   return recorder.finishRecordingAsPicture();