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

ui/views/controls/menu/menu_image_util.cc

Index: ui/views/controls/menu/menu_image_util.cc
diff --git a/ui/views/controls/menu/menu_image_util.cc b/ui/views/controls/menu/menu_image_util.cc
index 931edc9601f62ed5c8d544b4d4660a4f2c795837..bd587551d523454186fe05cd2eac34ece81d61de 100644
--- a/ui/views/controls/menu/menu_image_util.cc
+++ b/ui/views/controls/menu/menu_image_util.cc
@@ -31,8 +31,7 @@ const SkColor kIndicatorStroke = SkColorSetRGB(0, 0, 0);
 
 SkBitmap* CreateRadioButtonImage(bool selected) {
   // + 2 (1px on each side) to cover rounding error.
-  gfx::CanvasSkia canvas(gfx::Size(kIndicatorSize + 2, kIndicatorSize + 2),
-                         false);
+  gfx::Canvas canvas(gfx::Size(kIndicatorSize + 2, kIndicatorSize + 2), false);
   canvas.Translate(gfx::Point(1, 1));
 
   SkPoint gradient_points[3];
@@ -87,7 +86,7 @@ SkBitmap* GetRtlSubmenuArrowImage() {
   if (!kRtlArrow) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     const SkBitmap* r = rb.GetImageNamed(IDR_MENU_ARROW).ToSkBitmap();
-    gfx::CanvasSkia canvas(gfx::Size(r->width(), r->height()), false);
+    gfx::Canvas canvas(gfx::Size(r->width(), r->height()), false);
     canvas.Scale(-1, 1);
     canvas.DrawBitmapInt(*r, - r->width(), 0);
     kRtlArrow = new SkBitmap(canvas.ExtractBitmap());