[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/fonts/FontTest.cpp

Index: third_party/WebKit/Source/platform/fonts/FontTest.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontTest.cpp b/third_party/WebKit/Source/platform/fonts/FontTest.cpp
index 29a0f58d7b27cf66a0170e165d6e8d6883c7cacb..9b9e15a168b10eeff192bb8b119cc14b1e06d4ca 100644
--- a/third_party/WebKit/Source/platform/fonts/FontTest.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontTest.cpp
@@ -7,6 +7,7 @@
 #include "platform/testing/FontTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "platform/text/TextRun.h"
+#include "skia/ext/cdl_paint.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using blink::testing::createTestFont;
@@ -27,7 +28,7 @@ TEST(FontTest, TextIntercepts) {
                                           0x70, 0xc9, 0x70, 0xc9};
   TextRun ahemAboveBelowBaseline(ahemAboveBelowBaselineString, 9);
   TextRunPaintInfo textRunPaintInfo(ahemAboveBelowBaseline);
-  SkPaint defaultPaint;
+  CdlPaint defaultPaint;
   float deviceScaleFactor = 1;
 
   std::tuple<float, float> belowBaselineBounds = std::make_tuple(2, 4);