[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/layers/picture_layer_impl_unittest.cc

Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index fd4b5f37f0d01d495f5cc34ca7f7dd411979ebea..dc5b419841d4db5d9b67ba2abca2aba2f197e449 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -348,7 +348,7 @@ TEST_F(PictureLayerImplTest, TileGridAlignment) {
     // This test verifies that when drawing the contents of a specific tile
     // at content scale 1.0, the playback canvas never receives content from
     // neighboring tiles which indicates that the tile grid embedded in
-    // SkPicture is perfectly aligned with the compositor's tiles.
+    // CdlPicture is perfectly aligned with the compositor's tiles.
     EXPECT_EQ(1u, mock_canvas.rects_.size());
     EXPECT_EQ(*rect_iter, mock_canvas.rects_[0]);
     rect_iter++;