[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/testing/PictureMatchers.h

Index: third_party/WebKit/Source/platform/testing/PictureMatchers.h
diff --git a/third_party/WebKit/Source/platform/testing/PictureMatchers.h b/third_party/WebKit/Source/platform/testing/PictureMatchers.h
index 01368f213e4fbadfb4a62eea47368736feeb1219..9d7a6b210d1f81daea3a4225f3ddb2b5a9ed920c 100644
--- a/third_party/WebKit/Source/platform/testing/PictureMatchers.h
+++ b/third_party/WebKit/Source/platform/testing/PictureMatchers.h
@@ -6,10 +6,9 @@
 #define PictureMatchers_h
 
 #include "platform/graphics/Color.h"
+#include "skia/ext/cdl_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-class SkPicture;
-
 namespace blink {
 
 class FloatRect;
@@ -17,7 +16,7 @@ class FloatRect;
 // Matches if the picture draws exactly one rectangle, which (after accounting
 // for the total transformation matrix) matches the rect provided, and whose
 // paint has the color requested.
-::testing::Matcher<const SkPicture&> drawsRectangle(const FloatRect&, Color);
+::testing::Matcher<const CdlPicture&> drawsRectangle(const FloatRect&, Color);
 
 }  // namespace blink