[NOT FOR COMMIT] Fully replace SkCanvas uses.

ui/gfx/canvas_paint_mac.mm

Index: ui/gfx/canvas_paint_mac.mm
diff --git a/ui/gfx/canvas_paint_mac.mm b/ui/gfx/canvas_paint_mac.mm
index 29fdfe5ecf8b01855d31a46345d9d00f7b1961cf..dbeba69c0d1552b8c7e463952714368928cb54c1 100644
--- a/ui/gfx/canvas_paint_mac.mm
+++ b/ui/gfx/canvas_paint_mac.mm
@@ -21,7 +21,7 @@ CanvasSkiaPaint::CanvasSkiaPaint(NSRect dirtyRect, bool opaque)
 
 CanvasSkiaPaint::~CanvasSkiaPaint() {
   if (!is_empty()) {
-    SkCanvas* canvas = sk_canvas();
+    CdlCanvas* canvas = sk_canvas();
     canvas->restoreToCount(1);
 
     // Blit the dirty rect to the current context.
@@ -60,7 +60,7 @@ void CanvasSkiaPaint::Init(bool opaque) {
 
   gfx::Size size(NSWidth(rectangle_), NSHeight(rectangle_));
   RecreateBackingCanvas(size, scale, opaque);
-  SkCanvas* canvas = sk_canvas();
+  CdlCanvas* canvas = sk_canvas();
   canvas->clear(SkColorSetARGB(0, 0, 0, 0));
 
     // Need to translate so that the dirty region appears at the origin of the