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

chrome/browser/chromeos/status/network_menu_icon.cc

Index: chrome/browser/chromeos/status/network_menu_icon.cc
diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc
index a7c57343f03af1db0d3f5838d35f06fd4d01ff2c..46405b7a05fca27a9c20b481f73a1d4d3af0ebc8 100644
--- a/chrome/browser/chromeos/status/network_menu_icon.cc
+++ b/chrome/browser/chromeos/status/network_menu_icon.cc
@@ -161,9 +161,9 @@ const SkBitmap& GetEmptyVpnBadge() {
 }
 
 const SkBitmap GetVpnResource(int resource_id) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const SkBitmap* ethernet_icon = rb.GetBitmapNamed(resource_id);
-  gfx::CanvasSkia canvas(
+  gfx::Canvas canvas(
       gfx::Size(ethernet_icon->width(), ethernet_icon->height()), false);
   canvas.DrawBitmapInt(*ethernet_icon, 0, 0);
   const SkBitmap* vpn_badge = rb.GetBitmapNamed(kVpnBadgeId);
@@ -758,7 +758,7 @@ const SkBitmap NetworkMenuIcon::GenerateBitmapFromComponents(
     const SkBitmap* bottom_left_badge,
     const SkBitmap* bottom_right_badge) {
   DCHECK(!icon.empty());
-  gfx::CanvasSkia canvas(icon, false);
+  gfx::Canvas canvas(icon, false);
 
   if (top_left_badge) {
     canvas.DrawBitmapInt(*top_left_badge, kBadgeLeftX, kBadgeTopY);