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

ui/base/dragdrop/drag_utils.cc

Index: ui/base/dragdrop/drag_utils.cc
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc
index 70cfb7a0eb79eab73af5cbf05112df3c6624a8da..4ef00aefa17d2741fd60e24bfb002ef7ed41717c 100644
--- a/ui/base/dragdrop/drag_utils.cc
+++ b/ui/base/dragdrop/drag_utils.cc
@@ -10,7 +10,7 @@
 #include "googleurl/src/gurl.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/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
@@ -38,7 +38,7 @@ void CreateDragImageForFile(const FilePath& file_name,
   // Add +2 here to allow room for the halo.
   const int height = font.GetHeight() + icon->height() +
                      kLinkDragImageVPadding + 2;
-  gfx::CanvasSkia canvas(gfx::Size(width, height), false /* translucent */);
+  gfx::Canvas canvas(gfx::Size(width, height), false /* translucent */);
 
   // Paint the icon.
   canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
@@ -65,8 +65,8 @@ void SetDragImageOnDataObject(const gfx::Canvas& canvas,
                               const gfx::Size& size,
                               const gfx::Point& cursor_offset,
                               ui::OSExchangeData* data_object) {
-  SetDragImageOnDataObject(
-      canvas.AsCanvasSkia()->ExtractBitmap(), size, cursor_offset, data_object);
+  SetDragImageOnDataObject(canvas.ExtractBitmap(), size, cursor_offset,
+                           data_object);
 }
 
 }  // namespace drag_utils