[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/blimp/compositor_state_deserializer_unittest.cc

 // Copyright 2016 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 "compositor_state_deserializer.h"
 
 #include "base/run_loop.h"
 #include "cc/animation/animation_host.h"
 #include "cc/blimp/client_picture_cache.h"
 #include "cc/blimp/compositor_proto_state.h"
 #include "cc/blimp/layer_tree_host_remote.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/layers/solid_color_scrollbar_layer.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/fake_remote_compositor_bridge.h"
 #include "cc/test/remote_client_layer_factory.h"
 #include "cc/test/remote_compositor_test.h"
 #include "cc/test/serialization_test_utils.h"
 #include "cc/test/skia_common.h"
 #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 {
 
 class FakeContentLayerClient : public ContentLayerClient {
  public:
   FakeContentLayerClient(scoped_refptr<DisplayItemList> display_list,
                          gfx::Rect recorded_viewport)
       : display_list_(std::move(display_list)),
         recorded_viewport_(recorded_viewport) {}
@@ skipping 289 matching lines @@
 
 TEST_F(CompositorStateDeserializerTest, PictureLayer) {
   scoped_refptr<Layer> root_layer = Layer::Create();
   root_layer->SetBounds(gfx::Size(10, 10));
   root_layer->SetIsDrawable(true);
   layer_tree_host_remote_->GetLayerTree()->SetRootLayer(root_layer);
 
   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;
   scoped_refptr<DisplayItemList> display_list =
       DisplayItemList::Create(settings);
   const gfx::Rect visual_rect(0, 0, 42, 42);
   display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(visual_rect,
                                                                test_picture);
   display_list->Finalize();
   FakeContentLayerClient content_client(display_list, gfx::Rect(layer_size));
@@ skipping 34 matching lines @@
           picture_layer2->id()));
   scoped_refptr<DisplayItemList> client_display_list2 =
       client_picture_layer2->client()->PaintContentsToDisplayList(
           ContentLayerClient::PaintingControlSetting::PAINTING_BEHAVIOR_NORMAL);
   EXPECT_TRUE(AreDisplayListDrawingResultsSame(
       gfx::Rect(layer_size), display_list.get(), client_display_list2.get()));
 }
 
 }  // namespace
 }  // namespace cc