[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/test/picture_cache_model.h

Index: cc/test/picture_cache_model.h
diff --git a/cc/test/picture_cache_model.h b/cc/test/picture_cache_model.h
index d60a4fcb5fd40656bbc7e57bb4598ac59b161848..bae69318bb040b4d510860a0f12bec11b4f87178 100644
--- a/cc/test/picture_cache_model.h
+++ b/cc/test/picture_cache_model.h
@@ -10,10 +10,9 @@
 #include <unordered_map>
 
 #include "base/macros.h"
+#include "skia/ext/cdl_common.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
-class SkPicture;
-
 namespace cc {
 
 // PictureCacheModel provides a way for sharing a cache between an engine
@@ -25,12 +24,12 @@ class PictureCacheModel {
   PictureCacheModel();
   ~PictureCacheModel();
 
-  void AddPicture(const SkPicture* picture);
+  void AddPicture(const CdlPicture* picture);
 
-  sk_sp<const SkPicture> GetPicture(uint32_t unique_id);
+  sk_sp<const CdlPicture> GetPicture(uint32_t unique_id);
 
  private:
-  std::unordered_map<uint32_t, sk_sp<const SkPicture>> pictures_;
+  std::unordered_map<uint32_t, sk_sp<const CdlPicture>> pictures_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureCacheModel);
 };