[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/test/fake_engine_picture_cache.h

Index: cc/test/fake_engine_picture_cache.h
diff --git a/cc/test/fake_engine_picture_cache.h b/cc/test/fake_engine_picture_cache.h
index 4510419516c1a66fe7111b023bf8094b62fdccf6..78f82ddbe39c6fccf340996a94fc09deddb066f5 100644
--- a/cc/test/fake_engine_picture_cache.h
+++ b/cc/test/fake_engine_picture_cache.h
@@ -11,8 +11,7 @@
 
 #include "base/macros.h"
 #include "cc/blimp/engine_picture_cache.h"
-
-class SkPicture;
+#include "skia/ext/cdl_common.h"
 
 namespace cc {
 class DisplayItemList;
@@ -29,7 +28,7 @@ class FakeEnginePictureCache : public EnginePictureCache {
 
   // EnginePictureCache implementation.
   std::vector<PictureData> CalculateCacheUpdateAndFlush() override;
-  void MarkUsed(const SkPicture* picture) override;
+  void MarkUsed(const CdlPicture* picture) override;
 
  private:
   PictureCacheModel* model_;