ui/gfx: Rename almost all entries from gfx::CanvasSkia to gfx::Canvas.

ui/views/controls/table/table_view_win.cc

Index: ui/views/controls/table/table_view_win.cc
diff --git a/ui/views/controls/table/table_view_win.cc b/ui/views/controls/table/table_view_win.cc
index e85d63513ecf1de3feeaec4966543fb553950299..0ba1163ce5f829d0af6ead67bce022e72751d30f 100644
--- a/ui/views/controls/table/table_view_win.cc
+++ b/ui/views/controls/table/table_view_win.cc
@@ -809,7 +809,7 @@ HWND TableView::CreateNativeControl(HWND parent_container) {
     // We create 2 phony images because we are going to switch images at every
     // refresh in order to force a refresh of the icon area (somehow the clip
     // rect does not include the icon).
-    gfx::CanvasSkia canvas(gfx::Size(kImageSize, kImageSize), false);
+    gfx::Canvas canvas(gfx::Size(kImageSize, kImageSize), false);
     {
       base::win::ScopedHICON empty_icon(
           IconUtil::CreateHICONFromSkBitmap(canvas.ExtractBitmap()));
@@ -1154,11 +1154,11 @@ void TableView::PaintAltText() {
   HDC dc = GetDC(GetNativeControlHWND());
   gfx::Font font = GetAltTextFont();
   gfx::Rect bounds = GetAltTextBounds();
-  gfx::CanvasSkia canvas(bounds.size(), false);
+  gfx::Canvas canvas(bounds.size(), false);
   // Pad by 1 for halo.
   canvas.DrawStringWithHalo(alt_text_, font, SK_ColorDKGRAY, SK_ColorWHITE, 1,
                             1, bounds.width() - 2, bounds.height() - 2,
-                            gfx::CanvasSkia::DefaultCanvasTextAlignment());
+                            gfx::Canvas::DefaultCanvasTextAlignment());
   skia::DrawToNativeContext(
       canvas.sk_canvas(), dc, bounds.x(), bounds.y(), NULL);
   ReleaseDC(GetNativeControlHWND(), dc);
@@ -1238,9 +1238,9 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
             client_rect.top += content_offset_;
             // Make sure the region need to paint is visible.
             if (IntersectRect(&intersection, &icon_rect, &client_rect)) {
-              gfx::CanvasSkia canvas(
-                  gfx::Size(icon_rect.right - icon_rect.left,
-                            icon_rect.bottom - icon_rect.top), false);
+              gfx::Canvas canvas(gfx::Size(icon_rect.right - icon_rect.left,
+                                           icon_rect.bottom - icon_rect.top),
+                                 false);
 
               // It seems the state in nmcd.uItemState is not correct.
               // We'll retrieve it explicitly.