ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

ui/views/controls/combobox/native_combobox_views.cc

Index: ui/views/controls/combobox/native_combobox_views.cc
diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc
index 7557eaf22dc2bd98e8cff0ee88e664e51e6c9244..0a70dec72fd7ec9274778df246f05f9ec76d715c 100644
--- a/ui/views/controls/combobox/native_combobox_views.cc
+++ b/ui/views/controls/combobox/native_combobox_views.cc
@@ -140,7 +140,7 @@ bool NativeComboboxViews::OnKeyReleased(const views::KeyEvent& key_event) {
   return true;
 }
 
-void NativeComboboxViews::OnPaint(gfx::Canvas* canvas) {
+void NativeComboboxViews::OnPaint(gfx::CanvasSkia* canvas) {
   text_border_->set_has_focus(combobox_->HasFocus());
   OnPaintBackground(canvas);
   PaintText(canvas);
@@ -277,7 +277,7 @@ void NativeComboboxViews::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
 
-void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
+void NativeComboboxViews::PaintText(gfx::CanvasSkia* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();