Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

ui/gfx/image/image.cc

Index: ui/gfx/image/image.cc
===================================================================
--- ui/gfx/image/image.cc	(revision 147935)
+++ ui/gfx/image/image.cc	(working copy)
@@ -32,14 +32,12 @@
 const ImageSkia ImageSkiaFromGdkPixbuf(GdkPixbuf* pixbuf) {
   CHECK(pixbuf);
   gfx::Canvas canvas(gfx::Size(gdk_pixbuf_get_width(pixbuf),
-                               gdk_pixbuf_get_height(pixbuf)),
-                     ui::SCALE_FACTOR_100P,
-                     false);
+                               gdk_pixbuf_get_height(pixbuf)), false);
   skia::ScopedPlatformPaint scoped_platform_paint(canvas.sk_canvas());
   cairo_t* cr = scoped_platform_paint.GetPlatformSurface();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
   cairo_paint(cr);
-  return ImageSkia(canvas.ExtractImageRep());
+  return ImageSkia(SkBitmap(canvas.ExtractBitmap()));
 }
 #endif