[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/test/picture_cache_model.cc

Index: cc/test/picture_cache_model.cc
diff --git a/cc/test/picture_cache_model.cc b/cc/test/picture_cache_model.cc
index 08db42b1b4d701ce926311af87d450bc553bd7a6..054e132e06ca4e1e622418184206283d02c104f0 100644
--- a/cc/test/picture_cache_model.cc
+++ b/cc/test/picture_cache_model.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkData.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_picture.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 class SkPixelSerializer;
@@ -14,11 +14,13 @@ class SkPixelSerializer;
 namespace cc {
 namespace {
 
+/*
 sk_sp<SkPicture> CopySkPicture(const SkPicture* picture) {
   sk_sp<SkData> data = picture->serialize();
   DCHECK_GT(data->size(), 0u);
   return SkPicture::MakeFromData(data.get());
 }
+*/
 
 }  // namespace
 
@@ -26,12 +28,14 @@ PictureCacheModel::PictureCacheModel() = default;
 
 PictureCacheModel::~PictureCacheModel() = default;
 
-void PictureCacheModel::AddPicture(const SkPicture* picture) {
-  sk_sp<SkPicture> picture_copy = CopySkPicture(picture);
-  pictures_.insert(std::make_pair(picture->uniqueID(), picture_copy));
+void PictureCacheModel::AddPicture(const CdlPicture* picture) {
+  // sk_sp<CdlPicture> picture_copy = CopySkPicture(picture);
+  // TODO(cdl): CopyCdlPicture
+  sk_sp<const CdlPicture> picture_copy = sk_ref_sp(picture);
+  pictures_.insert(std::make_pair(picture_copy->uniqueID(), picture_copy));
 }
 
-sk_sp<const SkPicture> PictureCacheModel::GetPicture(uint32_t unique_id) {
+sk_sp<const CdlPicture> PictureCacheModel::GetPicture(uint32_t unique_id) {
   if (pictures_.find(unique_id) == pictures_.end())
     return nullptr;