[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/test/fake_client_picture_cache.cc

Index: cc/test/fake_client_picture_cache.cc
diff --git a/cc/test/fake_client_picture_cache.cc b/cc/test/fake_client_picture_cache.cc
index cf70574205ed6e11d4c7a4e0d7cd2c2014e9ba7a..d66356f281b47ce6bb08a4afe4e8ae122e160040 100644
--- a/cc/test/fake_client_picture_cache.cc
+++ b/cc/test/fake_client_picture_cache.cc
@@ -5,7 +5,7 @@
 #include "cc/test/fake_client_picture_cache.h"
 
 #include "cc/test/picture_cache_model.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_picture.h"
 
 namespace cc {
 
@@ -22,7 +22,7 @@ void FakeClientPictureCache::MarkUsed(uint32_t engine_picture_id) {
   used_picture_ids_.push_back(engine_picture_id);
 }
 
-sk_sp<const SkPicture> FakeClientPictureCache::GetPicture(uint32_t unique_id) {
+sk_sp<const CdlPicture> FakeClientPictureCache::GetPicture(uint32_t unique_id) {
   if (!model_)
     return nullptr;