[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/blimp/compositor_state_deserializer_unittest.cc

Index: cc/blimp/compositor_state_deserializer_unittest.cc
diff --git a/cc/blimp/compositor_state_deserializer_unittest.cc b/cc/blimp/compositor_state_deserializer_unittest.cc
index e044e66f878ff290e3818ed33f3efb5987aec79b..ac4f0d052acc3a46f3fede2625d1145fc1052994 100644
--- a/cc/blimp/compositor_state_deserializer_unittest.cc
+++ b/cc/blimp/compositor_state_deserializer_unittest.cc
@@ -27,8 +27,9 @@
 #include "cc/test/stub_layer_tree_host_client.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_common.h"
+#include "skia/ext/cdl_paint.h"
+#include "skia/ext/cdl_picture_recorder.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace cc {
 namespace {
@@ -338,15 +339,15 @@ TEST_F(CompositorStateDeserializerTest, PictureLayer) {
   gfx::Size layer_size = gfx::Size(5, 5);
 
   gfx::PointF offset(2.f, 3.f);
-  SkPictureRecorder recorder;
-  SkCanvas* canvas;
-  SkPaint red_paint;
+  CdlPictureRecorder recorder;
+  CdlCanvas* canvas;
+  CdlPaint red_paint;
   red_paint.setColor(SK_ColorRED);
   canvas = recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height()));
   canvas->translate(offset.x(), offset.y());
   canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
-  sk_sp<SkPicture> test_picture = recorder.finishRecordingAsPicture();
+  sk_sp<CdlPicture> test_picture = recorder.finishRecordingAsPicture();
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;