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

ui/views/button_drag_utils.cc

Index: ui/views/button_drag_utils.cc
diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc
index 5753fdce077c322df9d08a4499f1415213a676df..d65bc292d0b7ff9044a05cdfb9fe507216da4142 100644
--- a/ui/views/button_drag_utils.cc
+++ b/ui/views/button_drag_utils.cc
@@ -10,7 +10,7 @@
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/text_button.h"
 
@@ -41,7 +41,7 @@ void SetURLAndDragImage(const GURL& url,
   button.SetBounds(0, 0, prefsize.width(), prefsize.height());
 
   // Render the image.
-  gfx::CanvasSkia canvas(prefsize, false);
+  gfx::Canvas canvas(prefsize, false);
   button.PaintButton(&canvas, views::TextButton::PB_FOR_DRAG);
   drag_utils::SetDragImageOnDataObject(canvas, prefsize,
       gfx::Point(prefsize.width() / 2, prefsize.height() / 2), data);