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

ui/views/controls/label.cc

Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 567d60e5222d6488f3d998a28da33ffbeecd474c..17e82c23c556008dca2e603e5e21d97b69195c42 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -214,8 +214,7 @@ int Label::GetHeightForWidth(int w) {
 
   w = std::max(0, w - GetInsets().width());
   int h = font_.GetHeight();
-  gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h,
-                                 ComputeDrawStringFlags());
+  gfx::Canvas::SizeStringInt(text_, font_, &w, &h, ComputeDrawStringFlags());
   return h + GetInsets().height();
 }
 
@@ -293,7 +292,7 @@ gfx::Size Label::GetTextSize() const {
     int flags = ComputeDrawStringFlags();
     if (!is_multi_line_)
       flags |= gfx::Canvas::NO_ELLIPSIS;
-    gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, flags);
+    gfx::Canvas::SizeStringInt(text_, font_, &w, &h, flags);
     text_size_.SetSize(w, h);
     text_size_valid_ = true;
   }