Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/ui/gfx/canvas_skia.cc

Index: trunk/src/ui/gfx/canvas_skia.cc
===================================================================
--- trunk/src/ui/gfx/canvas_skia.cc	(revision 224498)
+++ trunk/src/ui/gfx/canvas_skia.cc	(working copy)
@@ -350,7 +350,7 @@
   // Create a temporary buffer filled with the halo color. It must leave room
   // for the 1-pixel border around the text.
   Size size(display_rect.width() + 2, display_rect.height() + 2);
-  Canvas text_canvas(size, image_scale(), true);
+  Canvas text_canvas(size, scale_factor(), true);
   SkPaint bkgnd_paint;
   bkgnd_paint.setColor(halo_color);
   text_canvas.DrawRect(Rect(size), bkgnd_paint);
@@ -381,7 +381,7 @@
 
   // Draw the halo bitmap with blur.
   ImageSkia text_image = ImageSkia(ImageSkiaRep(text_bitmap,
-      text_canvas.image_scale()));
+      text_canvas.scale_factor()));
   DrawImageInt(text_image, display_rect.x() - 1, display_rect.y() - 1);
 }